Use gtk_window_set_child throughout

Replace all uses of gtk_container_add on windows
by gtk_window_set_child.

diff --git a/demos/constraint-editor/constraint-editor-window.c b/demos/constraint-editor/constraint-editor-window.c
index cf2c11e2fd3b1ba88d22e6ec2fd3eb551cd4af98..1a78092994902569d4658b8765f49c0770e04f47 100644 (file)
--- a/demos/constraint-editor/constraint-editor-window.c
+++ b/demos/constraint-editor/constraint-editor-window.c
@@ -426,7 +426,7 @@ edit_constraint (ConstraintEditorWindow *win,
 
   editor = constraint_editor_new (model, constraint);
 
-  gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (editor));
+  gtk_window_set_child (GTK_WINDOW (window), GTK_WIDGET (editor));
 
   g_signal_connect (editor, "done", G_CALLBACK (constraint_editor_done), win);
 
@@ -460,7 +460,7 @@ edit_guide (ConstraintEditorWindow *win,
   gtk_window_set_title (GTK_WINDOW (window), "Edit Guide");
 
   editor = guide_editor_new (guide);
-  gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (editor));
+  gtk_window_set_child (GTK_WINDOW (window), GTK_WIDGET (editor));
 
   g_signal_connect (editor, "done", G_CALLBACK (guide_editor_done), win);
   gtk_widget_show (window);

diff --git a/demos/gtk-demo/clipboard.c b/demos/gtk-demo/clipboard.c
index ca8ca0767003ea01c05cc672884865091ba448a0..801baaa173dd2775ba9e357c6e6cb299ba035e3c 100644 (file)
--- a/demos/gtk-demo/clipboard.c
+++ b/demos/gtk-demo/clipboard.c
@@ -118,7 +118,7 @@ do_clipboard (GtkWidget *do_widget)
       gtk_widget_set_margin_top (vbox, 8);
       gtk_widget_set_margin_bottom (vbox, 8);
 
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       label = gtk_label_new ("\"Copy\" will copy the text\nin the entry to the clipboard");
 

diff --git a/demos/gtk-demo/combobox.c b/demos/gtk-demo/combobox.c
index e2e9d11f956d46a17ef412048895cdc354041bee..1fd1d7bcb902c08d13fb714d19c967cac03cf152 100644 (file)
--- a/demos/gtk-demo/combobox.c
+++ b/demos/gtk-demo/combobox.c
@@ -324,7 +324,7 @@ do_combobox (GtkWidget *do_widget)
     gtk_widget_set_margin_end (vbox, 10);
     gtk_widget_set_margin_top (vbox, 10);
     gtk_widget_set_margin_bottom (vbox, 10);
-    gtk_container_add (GTK_CONTAINER (window), vbox);
+    gtk_window_set_child (GTK_WINDOW (window), vbox);
 
     /* A combobox demonstrating cell renderers, separators and
      *  insensitive rows

diff --git a/demos/gtk-demo/constraints.c b/demos/gtk-demo/constraints.c
index 57c5554cc4b2a9976f7b87ce2f54c3f7545a91bd..f2f9076fa3b1d3782b611d3f713c015de7bbadbe 100644 (file)
--- a/demos/gtk-demo/constraints.c
+++ b/demos/gtk-demo/constraints.c
@@ -266,7 +266,7 @@ do_constraints (GtkWidget *do_widget)
                        G_CALLBACK (gtk_widget_destroyed), &window);
 
      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-     gtk_container_add (GTK_CONTAINER (window), box);
+     gtk_window_set_child (GTK_WINDOW (window), box);
 
      grid = g_object_new (simple_grid_get_type (), NULL);
      gtk_widget_set_hexpand (grid, TRUE);

diff --git a/demos/gtk-demo/constraints2.c b/demos/gtk-demo/constraints2.c
index db8a75b88fb06ba595a4c70300d277985b3836c5..cdaaa85088ee9243159b522db378fd24080ab4e3 100644 (file)
--- a/demos/gtk-demo/constraints2.c
+++ b/demos/gtk-demo/constraints2.c
@@ -222,7 +222,7 @@ do_constraints2 (GtkWidget *do_widget)
                        G_CALLBACK (gtk_widget_destroyed), &window);
 
      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-     gtk_container_add (GTK_CONTAINER (window), box);
+     gtk_window_set_child (GTK_WINDOW (window), box);
 
      grid = g_object_new (interactive_grid_get_type (), NULL);
      gtk_widget_set_hexpand (grid, TRUE);

diff --git a/demos/gtk-demo/constraints3.c b/demos/gtk-demo/constraints3.c
index 2c7566b42222eea1e634ee7d0b399543bc3ff539..01d81a48d2b2bc5a1bb507cce0bd24d0e5401c0d 100644 (file)
--- a/demos/gtk-demo/constraints3.c
+++ b/demos/gtk-demo/constraints3.c
@@ -142,7 +142,7 @@ do_constraints3 (GtkWidget *do_widget)
                        G_CALLBACK (gtk_widget_destroyed), &window);
 
      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-     gtk_container_add (GTK_CONTAINER (window), box);
+     gtk_window_set_child (GTK_WINDOW (window), box);
 
      grid = g_object_new (vfl_grid_get_type (), NULL);
      gtk_widget_set_hexpand (grid, TRUE);

diff --git a/demos/gtk-demo/css_accordion.c b/demos/gtk-demo/css_accordion.c
index 648393a5062f18bfd24b2df031b531efcc3f5731..d28262def01bde9a9c0433fdc98b4285f0968005 100644 (file)
--- a/demos/gtk-demo/css_accordion.c
+++ b/demos/gtk-demo/css_accordion.c
@@ -34,7 +34,7 @@ do_css_accordion (GtkWidget *do_widget)
       container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_widget_set_halign (container, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (container, GTK_ALIGN_CENTER);
-      gtk_container_add (GTK_CONTAINER (window), container);
+      gtk_window_set_child (GTK_WINDOW (window), container);
 
       child = gtk_button_new_with_label ("This");
       gtk_container_add (GTK_CONTAINER (container), child);

diff --git a/demos/gtk-demo/css_basics.c b/demos/gtk-demo/css_basics.c
index 83e408dd68d84858384e8b1e21a2566a05454197..2f46c4f38b1cddc590f5daa21fcebc07e62214cb 100644 (file)
--- a/demos/gtk-demo/css_basics.c
+++ b/demos/gtk-demo/css_basics.c
@@ -92,7 +92,7 @@ do_css_basics (GtkWidget *do_widget)
       provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
 
       container = gtk_scrolled_window_new (NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (window), container);
+      gtk_window_set_child (GTK_WINDOW (window), container);
       child = gtk_text_view_new_with_buffer (text);
       gtk_container_add (GTK_CONTAINER (container), child);
       g_signal_connect (text, "changed",

diff --git a/demos/gtk-demo/css_multiplebgs.c b/demos/gtk-demo/css_multiplebgs.c
index 056b647e691acccbf223673947064b1dcc0b2bdd..5e29060d85d860aca3566b9e4eeb32f4e1795885 100644 (file)
--- a/demos/gtk-demo/css_multiplebgs.c
+++ b/demos/gtk-demo/css_multiplebgs.c
@@ -94,7 +94,7 @@ do_css_multiplebgs (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       container = gtk_overlay_new ();
-      gtk_container_add (GTK_CONTAINER (window), container);
+      gtk_window_set_child (GTK_WINDOW (window), container);
 
       child = gtk_drawing_area_new ();
       gtk_widget_set_name (child, "canvas");

diff --git a/demos/gtk-demo/css_pixbufs.c b/demos/gtk-demo/css_pixbufs.c
index e60a7d4e87a427aa5d8b16de8acc53671906b209..9d88ef76fa5871e020f95ad0bcca81d9b29d333d 100644 (file)
--- a/demos/gtk-demo/css_pixbufs.c
+++ b/demos/gtk-demo/css_pixbufs.c
@@ -80,7 +80,7 @@ do_css_pixbufs (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-      gtk_container_add (GTK_CONTAINER (window), paned);
+      gtk_window_set_child (GTK_WINDOW (window), paned);
 
       /* Need a filler so we get a handle */
       child = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);

diff --git a/demos/gtk-demo/css_shadows.c b/demos/gtk-demo/css_shadows.c
index 6457d43efabc4095e74182d64f58db02754184fe..de21cfae292c458f61587c4021262a9d29a8c35e 100644 (file)
--- a/demos/gtk-demo/css_shadows.c
+++ b/demos/gtk-demo/css_shadows.c
@@ -99,7 +99,7 @@ do_css_shadows (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-      gtk_container_add (GTK_CONTAINER (window), paned);
+      gtk_window_set_child (GTK_WINDOW (window), paned);
 
       child = create_toolbar ();
       gtk_container_add (GTK_CONTAINER (paned), child);

diff --git a/demos/gtk-demo/dialog.c b/demos/gtk-demo/dialog.c
index 92a4e3371c71f9f10f5db0b5b688dea46321eaa1..6b965b9d84f045dd3207f3e25bf53a9166ccb83c 100644 (file)
--- a/demos/gtk-demo/dialog.c
+++ b/demos/gtk-demo/dialog.c
@@ -118,7 +118,7 @@ do_dialog (GtkWidget *do_widget)
       gtk_widget_set_margin_end (frame, 8);
       gtk_widget_set_margin_top (frame, 8);
       gtk_widget_set_margin_bottom (frame, 8);
-      gtk_container_add (GTK_CONTAINER (window), frame);
+      gtk_window_set_child (GTK_WINDOW (window), frame);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
       gtk_widget_set_margin_start (vbox, 8);

diff --git a/demos/gtk-demo/dnd.c b/demos/gtk-demo/dnd.c
index b2c1a307dad084803d314a1685c628f310706be9..30bae48e17e71fc26d3ec535e287c34476ef5a19 100644 (file)
--- a/demos/gtk-demo/dnd.c
+++ b/demos/gtk-demo/dnd.c
@@ -443,7 +443,7 @@ do_dnd (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (window), box);
+      gtk_window_set_child (GTK_WINDOW (window), box);
 
       box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_container_add (GTK_CONTAINER (box), box2);

diff --git a/demos/gtk-demo/drawingarea.c b/demos/gtk-demo/drawingarea.c
index 845b414834836f1e46bf35fb3b5ea4c69fb82d70..dd7380b63caeee614ac918d156e27aa111f53fa7 100644 (file)
--- a/demos/gtk-demo/drawingarea.c
+++ b/demos/gtk-demo/drawingarea.c
@@ -202,7 +202,7 @@ do_drawingarea (GtkWidget *do_widget)
       gtk_widget_set_margin_end (vbox, 16);
       gtk_widget_set_margin_top (vbox, 16);
       gtk_widget_set_margin_bottom (vbox, 16);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       /*
        * Create the checkerboard area

diff --git a/demos/gtk-demo/editable_cells.c b/demos/gtk-demo/editable_cells.c
index 5a559a674c28881ce31e4b8d01188f1a8907dff0..cb0ff0abfa2e93f73de9b82b9f7e3f9209f5c9db 100644 (file)
--- a/demos/gtk-demo/editable_cells.c
+++ b/demos/gtk-demo/editable_cells.c
@@ -360,7 +360,7 @@ do_editable_cells (GtkWidget *do_widget)
       gtk_widget_set_margin_end (vbox, 5);
       gtk_widget_set_margin_top (vbox, 5);
       gtk_widget_set_margin_bottom (vbox, 5);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       gtk_container_add (GTK_CONTAINER (vbox),
                           gtk_label_new ("Shopping list (you can edit the cells!)"));

diff --git a/demos/gtk-demo/entry_completion.c b/demos/gtk-demo/entry_completion.c
index 9cd193b2f824ab22905f23a508024525b6e90345..d371afc45123f33810785eaba4ca2e6714105661 100644 (file)
--- a/demos/gtk-demo/entry_completion.c
+++ b/demos/gtk-demo/entry_completion.c
@@ -59,7 +59,7 @@ do_entry_completion (GtkWidget *do_widget)
       gtk_widget_set_margin_end (vbox, 5);
       gtk_widget_set_margin_top (vbox, 5);
       gtk_widget_set_margin_bottom (vbox, 5);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label), "Completion demo, try writing <b>total</b> or <b>gnome</b> for example.");

diff --git a/demos/gtk-demo/entry_undo.c b/demos/gtk-demo/entry_undo.c
index 1c8babfd3f0d5966e8db3fd74d1823c6e536fa4f..9d069aeafb7423302229bab0c5fc961673ec1431 100644 (file)
--- a/demos/gtk-demo/entry_undo.c
+++ b/demos/gtk-demo/entry_undo.c
@@ -33,7 +33,7 @@ do_entry_undo (GtkWidget *do_widget)
       gtk_widget_set_margin_end (vbox, 5);
       gtk_widget_set_margin_top (vbox, 5);
       gtk_widget_set_margin_bottom (vbox, 5);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),

diff --git a/demos/gtk-demo/fixed.c b/demos/gtk-demo/fixed.c
index 7c739030a63b483ea4d2607cdaac8fd9619fc505..dcdf253596ae6fc1e80f5266b003109dae119384 100644 (file)
--- a/demos/gtk-demo/fixed.c
+++ b/demos/gtk-demo/fixed.c
@@ -131,7 +131,7 @@ create_demo_window (GtkWidget *do_widget)
   g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);
 
   sw = gtk_scrolled_window_new (NULL, NULL);
-  gtk_container_add (GTK_CONTAINER (window), sw);
+  gtk_window_set_child (GTK_WINDOW (window), sw);
 
   fixed = gtk_fixed_new ();
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), fixed);

diff --git a/demos/gtk-demo/flowbox.c b/demos/gtk-demo/flowbox.c
index 901b78cb6a7cf41f58e3135d849f391cea9d8efe..fd87463b8986a3a2783b2f516893974947eee52d 100644 (file)
--- a/demos/gtk-demo/flowbox.c
+++ b/demos/gtk-demo/flowbox.c
@@ -736,7 +736,7 @@ do_flowbox (GtkWidget *do_widget)
       gtk_flow_box_set_selection_mode (GTK_FLOW_BOX (flowbox), GTK_SELECTION_NONE);
 
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled), flowbox);
-      gtk_container_add (GTK_CONTAINER (window), scrolled);
+      gtk_window_set_child (GTK_WINDOW (window), scrolled);
 
       for (i = 0; colors[i]; i++)
         gtk_container_add (GTK_CONTAINER (flowbox), color_swatch_new (colors[i]));

diff --git a/demos/gtk-demo/gears.c b/demos/gtk-demo/gears.c
index 66fb2b420f46f9d8c4c3114ec9642263ae9a379f..f6237da494e04d62c14f7f10eac3c3cfef7663be 100644 (file)
--- a/demos/gtk-demo/gears.c
+++ b/demos/gtk-demo/gears.c
@@ -93,7 +93,7 @@ do_gears (GtkWidget *do_widget)
       gtk_widget_set_margin_top (overlay, 12);
       gtk_widget_set_margin_bottom (overlay, 12);
 
-      gtk_container_add (GTK_CONTAINER (window), overlay);
+      gtk_window_set_child (GTK_WINDOW (window), overlay);
 
       frame = gtk_frame_new (NULL);
       gtk_widget_set_halign (frame, GTK_ALIGN_START);

diff --git a/demos/gtk-demo/gestures.c b/demos/gtk-demo/gestures.c
index d50eb34b99ba1ab910175a8dae677fc14ef6a534..f238da1666824529b1dc43613d7a3930c0a572cb 100644 (file)
--- a/demos/gtk-demo/gestures.c
+++ b/demos/gtk-demo/gestures.c
@@ -153,7 +153,7 @@ do_gestures (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       drawing_area = gtk_drawing_area_new ();
-      gtk_container_add (GTK_CONTAINER (window), drawing_area);
+      gtk_window_set_child (GTK_WINDOW (window), drawing_area);
 
       gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (drawing_area),
                                       drawing_area_draw,

diff --git a/demos/gtk-demo/glarea.c b/demos/gtk-demo/glarea.c
index a72cf7c37676c3bcb12a00b7b08f3bacb5435b9f..0a5f965a070acb8b8875b72c8648312ff98cb562 100644 (file)
--- a/demos/gtk-demo/glarea.c
+++ b/demos/gtk-demo/glarea.c
@@ -401,7 +401,7 @@ create_glarea_window (GtkWidget *do_widget)
   gtk_widget_set_margin_top (box, 12);
   gtk_widget_set_margin_bottom (box, 12);
   gtk_box_set_spacing (GTK_BOX (box), 6);
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
 
   gl_area = gtk_gl_area_new ();
   gtk_widget_set_hexpand (gl_area, TRUE);

diff --git a/demos/gtk-demo/headerbar.c b/demos/gtk-demo/headerbar.c
index a1ddf9751192d826f6ee11fc4e30e775e127ff90..e8a0ead1a9b63d4d49c8898e7351a9b7a2d35055 100644 (file)
--- a/demos/gtk-demo/headerbar.c
+++ b/demos/gtk-demo/headerbar.c
@@ -52,7 +52,7 @@ do_headerbar (GtkWidget *do_widget)
 
       gtk_window_set_titlebar (GTK_WINDOW (window), header);
 
-      gtk_container_add (GTK_CONTAINER (window), gtk_text_view_new ());
+      gtk_window_set_child (GTK_WINDOW (window), gtk_text_view_new ());
     }
 
   if (!gtk_widget_get_visible (window))

diff --git a/demos/gtk-demo/hypertext.c b/demos/gtk-demo/hypertext.c
index 81a19e33054418081efd010607bbb8540f2b9b00..9191cabe492d63a037236b646a0f40bc46697bb7 100644 (file)
--- a/demos/gtk-demo/hypertext.c
+++ b/demos/gtk-demo/hypertext.c
@@ -266,7 +266,7 @@ do_hypertext (GtkWidget *do_widget)
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
-      gtk_container_add (GTK_CONTAINER (window), sw);
+      gtk_window_set_child (GTK_WINDOW (window), sw);
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), view);
 
       show_page (buffer, 1);

diff --git a/demos/gtk-demo/iconview.c b/demos/gtk-demo/iconview.c
index 8a6372d1199a65d6fe1cd779c4ecc69b07e74586..0b80aafae154cf7e23857959f94ac14fce809924 100644 (file)
--- a/demos/gtk-demo/iconview.c
+++ b/demos/gtk-demo/iconview.c
@@ -263,7 +263,7 @@ do_iconview (GtkWidget *do_widget)
       load_pixbufs ();
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       tool_bar = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_container_add (GTK_CONTAINER (vbox), tool_bar);

diff --git a/demos/gtk-demo/iconview_edit.c b/demos/gtk-demo/iconview_edit.c
index a9b4f890b70a2b784c9e90ca2d06e7103b688af3..6e5c52d2a69f704709418450fe98ff3e674e98c6 100644 (file)
--- a/demos/gtk-demo/iconview_edit.c
+++ b/demos/gtk-demo/iconview_edit.c
@@ -146,7 +146,7 @@ do_iconview_edit (GtkWidget *do_widget)
                                       "text", COL_TEXT,
                                       NULL);
 
-      gtk_container_add (GTK_CONTAINER (window), icon_view);
+      gtk_window_set_child (GTK_WINDOW (window), icon_view);
     }
 
   if (!gtk_widget_get_visible (window))

diff --git a/demos/gtk-demo/images.c b/demos/gtk-demo/images.c
index 455343a9336fd2ae742db5bf002845417749f243..b0efca8a1b99fa128eeb6b73a22e13682a4287bf 100644 (file)
--- a/demos/gtk-demo/images.c
+++ b/demos/gtk-demo/images.c
@@ -346,7 +346,7 @@ do_images (GtkWidget *do_widget)
       gtk_widget_set_margin_end (base_vbox, 16);
       gtk_widget_set_margin_top (base_vbox, 16);
       gtk_widget_set_margin_bottom (base_vbox, 16);
-      gtk_container_add (GTK_CONTAINER (window), base_vbox);
+      gtk_window_set_child (GTK_WINDOW (window), base_vbox);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 16);
       gtk_container_add (GTK_CONTAINER (base_vbox), hbox);

diff --git a/demos/gtk-demo/infobar.c b/demos/gtk-demo/infobar.c
index c6f744c2abd6afb46497b3b05f0eaa62a2e4aa47..92fc46b26c543c89ccddd5fef5c97c0648a4a61a 100644 (file)
--- a/demos/gtk-demo/infobar.c
+++ b/demos/gtk-demo/infobar.c
@@ -66,7 +66,7 @@ do_infobar (GtkWidget *do_widget)
       gtk_widget_set_margin_end (vbox, 8);
       gtk_widget_set_margin_top (vbox, 8);
       gtk_widget_set_margin_bottom (vbox, 8);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       bar = gtk_info_bar_new ();
       gtk_container_add (GTK_CONTAINER (vbox), bar);

diff --git a/demos/gtk-demo/links.c b/demos/gtk-demo/links.c
index 49171765816fe536379344605fd8f96b5f4fc89e..219f09634685b59d833a7d5ea6ada880cb30fd7a 100644 (file)
--- a/demos/gtk-demo/links.c
+++ b/demos/gtk-demo/links.c
@@ -81,7 +81,7 @@ do_links (GtkWidget *do_widget)
       gtk_widget_set_margin_end (label, 20);
       gtk_widget_set_margin_top (label, 20);
       gtk_widget_set_margin_bottom (label, 20);
-      gtk_container_add (GTK_CONTAINER (window), label);
+      gtk_window_set_child (GTK_WINDOW (window), label);
       gtk_widget_show (label);
     }
 

diff --git a/demos/gtk-demo/list_store.c b/demos/gtk-demo/list_store.c
index 27815802ca0e6853f583e113430d131fabe62888..941548318c8d8a5c828ca806845de6faf2fc0bb8 100644 (file)
--- a/demos/gtk-demo/list_store.c
+++ b/demos/gtk-demo/list_store.c
@@ -266,7 +266,7 @@ do_list_store (GtkWidget *do_widget)
       gtk_widget_set_margin_end (vbox, 8);
       gtk_widget_set_margin_top (vbox, 8);
       gtk_widget_set_margin_bottom (vbox, 8);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       label = gtk_label_new ("This is the bug list (note: not based on real data, it would be nice to have a nice ODBC interface to bugzilla or so, though).");
       gtk_container_add (GTK_CONTAINER (vbox), label);

diff --git a/demos/gtk-demo/listbox.c b/demos/gtk-demo/listbox.c
index d988ec5e6587becf2b7fd96e819e5e8b6c5c98eb..fe9c3e2fd393a20ae68b2859ef2b5a1a3d461665 100644 (file)
--- a/demos/gtk-demo/listbox.c
+++ b/demos/gtk-demo/listbox.c
@@ -360,7 +360,7 @@ do_listbox (GtkWidget *do_widget)
                         &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);
       label = gtk_label_new ("Messages from GTK and friends");
       gtk_container_add (GTK_CONTAINER (vbox), label);
       scrolled = gtk_scrolled_window_new (NULL, NULL);

diff --git a/demos/gtk-demo/markup.c b/demos/gtk-demo/markup.c
index a9a0eaf11bc3e25e0f852de4910d074c55fad859..7b23ec925268aa7a622741090259288f841181ac 100644 (file)
--- a/demos/gtk-demo/markup.c
+++ b/demos/gtk-demo/markup.c
@@ -63,7 +63,7 @@ do_markup (GtkWidget *do_widget)
 
       stack = gtk_stack_new ();
       gtk_widget_show (stack);
-      gtk_container_add (GTK_CONTAINER (window), stack);
+      gtk_window_set_child (GTK_WINDOW (window), stack);
 
       show_source = gtk_check_button_new_with_label ("Source");
       gtk_widget_set_valign (show_source, GTK_ALIGN_CENTER);

diff --git a/demos/gtk-demo/overlay.c b/demos/gtk-demo/overlay.c
index afc7c534df2b2ee1349f87314bb09b62c2ecf649..be3c2e1696e30fa0d1d083db3ed65bed386fc75a 100644 (file)
--- a/demos/gtk-demo/overlay.c
+++ b/demos/gtk-demo/overlay.c
@@ -78,7 +78,7 @@ do_overlay (GtkWidget *do_widget)
       gtk_widget_set_margin_bottom (entry, 8);
       gtk_container_add (GTK_CONTAINER (vbox), entry);
 
-      gtk_container_add (GTK_CONTAINER (window), overlay);
+      gtk_window_set_child (GTK_WINDOW (window), overlay);
 
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);

diff --git a/demos/gtk-demo/overlay2.c b/demos/gtk-demo/overlay2.c
index b990701944baf7709d697360c3a917aa35bf88a0..8d491faea81cd3404ebd0e18e226df54ce68eae0 100644 (file)
--- a/demos/gtk-demo/overlay2.c
+++ b/demos/gtk-demo/overlay2.c
@@ -57,7 +57,7 @@ do_overlay2 (GtkWidget *do_widget)
       gtk_text_iter_forward_word_end (&end);
       gtk_text_buffer_apply_tag (buffer, tag, &start, &end);
 
-      gtk_container_add (GTK_CONTAINER (window), overlay);
+      gtk_window_set_child (GTK_WINDOW (window), overlay);
       gtk_container_add (GTK_CONTAINER (overlay), sw);
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), text);
 

diff --git a/demos/gtk-demo/paint.c b/demos/gtk-demo/paint.c
index f392ea2769f187f42d1cfe190710adccb599627b..a13750801edafb64756d1d418306de552055c1a5 100644 (file)
--- a/demos/gtk-demo/paint.c
+++ b/demos/gtk-demo/paint.c
@@ -389,7 +389,7 @@ do_paint (GtkWidget *toplevel)
       window = gtk_window_new ();
 
       draw_area = drawing_area_new ();
-      gtk_container_add (GTK_CONTAINER (window), draw_area);
+      gtk_window_set_child (GTK_WINDOW (window), draw_area);
 
       headerbar = gtk_header_bar_new ();
       gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (headerbar), TRUE);

diff --git a/demos/gtk-demo/paintable.c b/demos/gtk-demo/paintable.c
index c4c31b61ca0048a28af15eb15bc0660e6da56172..63fef5d5c80bef535b5cbcd729a9a72e872f2562 100644 (file)
--- a/demos/gtk-demo/paintable.c
+++ b/demos/gtk-demo/paintable.c
@@ -164,7 +164,7 @@ do_paintable (GtkWidget *do_widget)
 
       nuclear = gtk_nuclear_icon_new (0.0);
       image = gtk_image_new_from_paintable (nuclear);
-      gtk_container_add (GTK_CONTAINER (window), image);
+      gtk_window_set_child (GTK_WINDOW (window), image);
       g_object_unref (nuclear);
     }
 

diff --git a/demos/gtk-demo/paintable_animated.c b/demos/gtk-demo/paintable_animated.c
index e81d9d2f94437b7fb7569f7c29b2800c72a50368..4c71512b1eabce9bfa642e649eaa1dcfdc9e55ca 100644 (file)
--- a/demos/gtk-demo/paintable_animated.c
+++ b/demos/gtk-demo/paintable_animated.c
@@ -196,7 +196,7 @@ do_paintable_animated (GtkWidget *do_widget)
 
       nuclear = gtk_nuclear_animation_new ();
       image = gtk_image_new_from_paintable (nuclear);
-      gtk_container_add (GTK_CONTAINER (window), image);
+      gtk_window_set_child (GTK_WINDOW (window), image);
       g_object_unref (nuclear);
     }
 

diff --git a/demos/gtk-demo/paintable_mediastream.c b/demos/gtk-demo/paintable_mediastream.c
index a666b3d3e0de82eb74a31c2122aaef75d123a991..4b1cde9e2dd8df34d5a48750084879edb44c7712 100644 (file)
--- a/demos/gtk-demo/paintable_mediastream.c
+++ b/demos/gtk-demo/paintable_mediastream.c
@@ -298,7 +298,7 @@ do_paintable_mediastream (GtkWidget *do_widget)
       gtk_media_stream_set_loop (GTK_MEDIA_STREAM (nuclear), TRUE);
 
       video = gtk_video_new_for_media_stream (nuclear);
-      gtk_container_add (GTK_CONTAINER (window), video);
+      gtk_window_set_child (GTK_WINDOW (window), video);
 
       g_object_unref (nuclear);
     }

diff --git a/demos/gtk-demo/panes.c b/demos/gtk-demo/panes.c
index 98ce0fd6641ebad9e3c35e0e25a33da81654b137..6a5c9bc59edc281db348c63b724c68d9438b10dc 100644 (file)
--- a/demos/gtk-demo/panes.c
+++ b/demos/gtk-demo/panes.c
@@ -159,7 +159,7 @@ do_panes (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Paned Widgets");
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
       gtk_widget_set_margin_start (vpaned, 5);

diff --git a/demos/gtk-demo/password_entry.c b/demos/gtk-demo/password_entry.c
index 56310d23a5070ef7bfc3672c583e11d3ee3ebf87..f8246dd4a4f16379da98788ef3044e4698c9669b 100644 (file)
--- a/demos/gtk-demo/password_entry.c
+++ b/demos/gtk-demo/password_entry.c
@@ -53,7 +53,7 @@ do_password_entry (GtkWidget *do_widget)
       gtk_widget_set_margin_end (box, 18);
       gtk_widget_set_margin_top (box, 18);
       gtk_widget_set_margin_bottom (box, 18);
-      gtk_container_add (GTK_CONTAINER (window), box);
+      gtk_window_set_child (GTK_WINDOW (window), box);
 
       entry = gtk_password_entry_new ();
       gtk_password_entry_set_show_peek_icon (GTK_PASSWORD_ENTRY (entry), TRUE);

diff --git a/demos/gtk-demo/peg_solitaire.c b/demos/gtk-demo/peg_solitaire.c
index f4f3fc4e2677c345a774597b3bef611d949d8d4c..00fdca3d56c3437ac55f75849b0c9ec8808010e8 100644 (file)
--- a/demos/gtk-demo/peg_solitaire.c
+++ b/demos/gtk-demo/peg_solitaire.c
@@ -294,7 +294,7 @@ do_peg_solitaire (GtkWidget *do_widget)
       gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
       gtk_grid_set_row_homogeneous (GTK_GRID (grid), TRUE);
       gtk_grid_set_column_homogeneous (GTK_GRID (grid), TRUE);
-      gtk_container_add (GTK_CONTAINER (window), grid);
+      gtk_window_set_child (GTK_WINDOW (window), grid);
 
       for (x = 0; x < 7; x++)
         {

diff --git a/demos/gtk-demo/pickers.c b/demos/gtk-demo/pickers.c
index e17620022b5dab2ad530dfbd8f4cdfe64ad30098..5f6b3f84971d90f455a5dcc42eb60e986f03f9cc 100644 (file)
--- a/demos/gtk-demo/pickers.c
+++ b/demos/gtk-demo/pickers.c
@@ -29,7 +29,7 @@ do_pickers (GtkWidget *do_widget)
     gtk_widget_set_margin_bottom (table, 20);
     gtk_grid_set_row_spacing (GTK_GRID (table), 3);
     gtk_grid_set_column_spacing (GTK_GRID (table), 10);
-    gtk_container_add (GTK_CONTAINER (window), table);
+    gtk_window_set_child (GTK_WINDOW (window), table);
 
     label = gtk_label_new ("Color:");
     gtk_widget_set_halign (label, GTK_ALIGN_START);

diff --git a/demos/gtk-demo/pixbufs.c b/demos/gtk-demo/pixbufs.c
index eab22a464e48a923ebaa0124146fad218cc0c09c..aece1dfb4a802115a3333b6b943a61e999ac4237 100644 (file)
--- a/demos/gtk-demo/pixbufs.c
+++ b/demos/gtk-demo/pixbufs.c
@@ -212,7 +212,7 @@ do_pixbufs (GtkWidget *do_widget)
           gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (da), back_height);
           gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), draw_func, NULL, NULL);
 
-          gtk_container_add (GTK_CONTAINER (window), da);
+          gtk_window_set_child (GTK_WINDOW (window), da);
 
           gtk_widget_add_tick_callback (da, on_tick, NULL, NULL);
         }

diff --git a/demos/gtk-demo/rotated_text.c b/demos/gtk-demo/rotated_text.c
index eef6f7ca35649a1dd99968ec31dbad9f8c474b4e..b86a5e69446876265b22308ae4c83e6afc6022e7 100644 (file)
--- a/demos/gtk-demo/rotated_text.c
+++ b/demos/gtk-demo/rotated_text.c
@@ -185,7 +185,7 @@ do_rotated_text (GtkWidget *do_widget)
 
       box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_box_set_homogeneous (GTK_BOX (box), TRUE);
-      gtk_container_add (GTK_CONTAINER (window), box);
+      gtk_window_set_child (GTK_WINDOW (window), box);
 
       /* Add a drawing area */
       drawing_area = gtk_drawing_area_new ();

diff --git a/demos/gtk-demo/search_entry.c b/demos/gtk-demo/search_entry.c
index d9999eea5ef8ddc8ca4baa2aec891b824373d780..a072aa0962b575bd99d9b1a503616dbef29a2f44 100644 (file)
--- a/demos/gtk-demo/search_entry.c
+++ b/demos/gtk-demo/search_entry.c
@@ -269,7 +269,7 @@ do_search_entry (GtkWidget *do_widget)
       gtk_widget_set_margin_end (vbox, 5);
       gtk_widget_set_margin_top (vbox, 5);
       gtk_widget_set_margin_bottom (vbox, 5);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label), "Search entry demo");

diff --git a/demos/gtk-demo/search_entry2.c b/demos/gtk-demo/search_entry2.c
index 68a9de3faabe097125e86ee1ea2d841d81d9ba53..de8c577b917c6a89017ec88f0314a0e0defa2ba6 100644 (file)
--- a/demos/gtk-demo/search_entry2.c
+++ b/demos/gtk-demo/search_entry2.c
@@ -78,7 +78,7 @@ do_search_entry2 (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       entry = gtk_search_entry_new ();
       container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);

diff --git a/demos/gtk-demo/shortcut_triggers.c b/demos/gtk-demo/shortcut_triggers.c
index c57edea5fcd62004216414a3fb0af798c6de3975..509a7f55143c61ba3b9c6468ad0603f07bd74e80 100644 (file)
--- a/demos/gtk-demo/shortcut_triggers.c
+++ b/demos/gtk-demo/shortcut_triggers.c
@@ -65,7 +65,7 @@ do_shortcut_triggers (GtkWidget *do_widget)
       gtk_widget_set_margin_bottom (list, 6);
       gtk_widget_set_margin_start (list, 6);
       gtk_widget_set_margin_end (list, 6);
-      gtk_container_add (GTK_CONTAINER (window), list);
+      gtk_window_set_child (GTK_WINDOW (window), list);
 
       for (i = 0; i < G_N_ELEMENTS (shortcuts); i++)
         {

diff --git a/demos/gtk-demo/sidebar.c b/demos/gtk-demo/sidebar.c
index 2b64ec2264199ef3f71ab17f96cdafc8c5f01e12..420861f225912ac0511e37314ab06f63b2ebc057 100644 (file)
--- a/demos/gtk-demo/sidebar.c
+++ b/demos/gtk-demo/sidebar.c
@@ -74,7 +74,7 @@ do_sidebar (GtkWidget *do_widget)
           g_object_set (gtk_stack_get_page (GTK_STACK (stack), widget), "title", c, NULL);
         }
 
-       gtk_container_add (GTK_CONTAINER (window), box);
+      gtk_window_set_child (GTK_WINDOW (window), box);
     }
 
   if (!gtk_widget_get_visible (window))

diff --git a/demos/gtk-demo/sizegroup.c b/demos/gtk-demo/sizegroup.c
index edbf9e9cf2020b294a69a7feb7d6709d7a312e80..9d12dd35516f48b108c1e0cad1a5088ab5d0b33c 100644 (file)
--- a/demos/gtk-demo/sizegroup.c
+++ b/demos/gtk-demo/sizegroup.c
@@ -112,7 +112,7 @@ do_sizegroup (GtkWidget *do_widget)
       gtk_widget_set_margin_end (vbox, 5);
       gtk_widget_set_margin_top (vbox, 5);
       gtk_widget_set_margin_bottom (vbox, 5);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
       g_object_set_data_full (G_OBJECT (window), "size-group", size_group, g_object_unref);

diff --git a/demos/gtk-demo/sliding_puzzle.c b/demos/gtk-demo/sliding_puzzle.c
index 00c2a765e4358a177cba025c41bf9e5864153328..03ac047e6aaf7b6f7bc914873cee969523520eaa 100644 (file)
--- a/demos/gtk-demo/sliding_puzzle.c
+++ b/demos/gtk-demo/sliding_puzzle.c
@@ -463,7 +463,7 @@ do_sliding_puzzle (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       frame = gtk_aspect_frame_new (0.5, 0.5, (float) gdk_paintable_get_intrinsic_aspect_ratio (puzzle), FALSE);
-      gtk_container_add (GTK_CONTAINER (window), frame);
+      gtk_window_set_child (GTK_WINDOW (window), frame);
 
       start_puzzle (puzzle);
     }

diff --git a/demos/gtk-demo/tabs.c b/demos/gtk-demo/tabs.c
index 034b60a566aefd545b709670d314e1fc51448b07..0a046a594e4e87bc4d7c03014cc9dcd9efbf8f30 100644 (file)
--- a/demos/gtk-demo/tabs.c
+++ b/demos/gtk-demo/tabs.c
@@ -46,7 +46,7 @@ do_tabs (GtkWidget *do_widget)
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
-      gtk_container_add (GTK_CONTAINER (window), sw);
+      gtk_window_set_child (GTK_WINDOW (window), sw);
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), view);
     }
 

diff --git a/demos/gtk-demo/tagged_entry.c b/demos/gtk-demo/tagged_entry.c
index c7b0816c4aed5de3f6de756c6c22347c63d213e1..26795421bc97d297c55ca1f69d1b5a68c41a83a3 100644 (file)
--- a/demos/gtk-demo/tagged_entry.c
+++ b/demos/gtk-demo/tagged_entry.c
@@ -80,7 +80,7 @@ do_tagged_entry (GtkWidget *do_widget)
       gtk_widget_set_margin_end (box, 18);
       gtk_widget_set_margin_top (box, 18);
       gtk_widget_set_margin_bottom (box, 18);
-      gtk_container_add (GTK_CONTAINER (window), box);
+      gtk_window_set_child (GTK_WINDOW (window), box);
 
       entry = demo_tagged_entry_new ();
       gtk_container_add (GTK_CONTAINER (box), entry);

diff --git a/demos/gtk-demo/textmask.c b/demos/gtk-demo/textmask.c
index 6457be2857d50093f880eee7afc424216c8c0562..ff66ce29619f8cd2fdf85323716b8ba8daf7db44 100644 (file)
--- a/demos/gtk-demo/textmask.c
+++ b/demos/gtk-demo/textmask.c
@@ -69,7 +69,7 @@ do_textmask (GtkWidget *do_widget)
 
       da = gtk_drawing_area_new ();
 
-      gtk_container_add (GTK_CONTAINER (window), da);
+      gtk_window_set_child (GTK_WINDOW (window), da);
       gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), draw_text, NULL, NULL);
     }
 

diff --git a/demos/gtk-demo/textscroll.c b/demos/gtk-demo/textscroll.c
index ccd5d521b15815e12caf8619106e016c10c64db2..02df96c7a9a484d3eca0b9f68ee2c4c61d34c8cb 100644 (file)
--- a/demos/gtk-demo/textscroll.c
+++ b/demos/gtk-demo/textscroll.c
@@ -188,7 +188,7 @@ do_textscroll (GtkWidget *do_widget)
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
       gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
-      gtk_container_add (GTK_CONTAINER (window), hbox);
+      gtk_window_set_child (GTK_WINDOW (window), hbox);
 
       create_text_view (hbox, TRUE);
       create_text_view (hbox, FALSE);

diff --git a/demos/gtk-demo/textundo.c b/demos/gtk-demo/textundo.c
index fb3a03e4424c47141c5270439675a6191f7e76ca..d7e35e0851f7b4600b7ecf14a30303bd314f7e80 100644 (file)
--- a/demos/gtk-demo/textundo.c
+++ b/demos/gtk-demo/textundo.c
@@ -53,7 +53,7 @@ do_textundo (GtkWidget *do_widget)
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
-      gtk_container_add (GTK_CONTAINER (window), sw);
+      gtk_window_set_child (GTK_WINDOW (window), sw);
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), view);
     }
 

diff --git a/demos/gtk-demo/textview.c b/demos/gtk-demo/textview.c
index 0acc03e9e202a527c8419ff099f57a32055fa885..68e0b35c2028b34dc14a803451a368778c6b884e 100644 (file)
--- a/demos/gtk-demo/textview.c
+++ b/demos/gtk-demo/textview.c
@@ -486,7 +486,7 @@ do_textview (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Multiple Views");
 
       vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-      gtk_container_add (GTK_CONTAINER (window), vpaned);
+      gtk_window_set_child (GTK_WINDOW (window), vpaned);
 
       /* For convenience, we just use the autocreated buffer from
        * the first text view; you could also create the buffer
@@ -594,7 +594,7 @@ easter_egg_callback (GtkWidget *button,
                                   GTK_POLICY_AUTOMATIC,
                                   GTK_POLICY_AUTOMATIC);
 
-  gtk_container_add (GTK_CONTAINER (window), sw);
+  gtk_window_set_child (GTK_WINDOW (window), sw);
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), view);
 
   window_ptr = &window;

diff --git a/demos/gtk-demo/theming_style_classes.c b/demos/gtk-demo/theming_style_classes.c
index f67660678ecee77bc6f6ecf2cee121766d17dda8..db91d92c5cbb9bf95fe0d6368c525ce2b3e886e1 100644 (file)
--- a/demos/gtk-demo/theming_style_classes.c
+++ b/demos/gtk-demo/theming_style_classes.c
@@ -31,7 +31,7 @@ do_theming_style_classes (GtkWidget *do_widget)
       builder = gtk_builder_new_from_resource ("/theming_style_classes/theming.ui");
 
       grid = (GtkWidget *)gtk_builder_get_object (builder, "grid");
-      gtk_container_add (GTK_CONTAINER (window), grid);
+      gtk_window_set_child (GTK_WINDOW (window), grid);
       g_object_unref (builder);
     }
 

diff --git a/demos/gtk-demo/transparent.c b/demos/gtk-demo/transparent.c
index 5422cb14ea100243b6dd79143c3b36c8bf1d3a7c..65a7152c11fd368d0dfd249e3b096fd1358d5b14 100644 (file)
--- a/demos/gtk-demo/transparent.c
+++ b/demos/gtk-demo/transparent.c
@@ -29,7 +29,7 @@ do_transparent (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Transparency");
 
       overlay = blur_overlay_new ();
-      gtk_container_add (GTK_CONTAINER (window), overlay);
+      gtk_window_set_child (GTK_WINDOW (window), overlay);
 
       button = gtk_button_new_with_label ("Don't click this button!");
       label = gtk_button_get_child (GTK_BUTTON (button));

diff --git a/demos/gtk-demo/tree_store.c b/demos/gtk-demo/tree_store.c
index f404fcc7578c0150a7a2f899f5d678e875371f28..f39b409718ad1ae608c2099e6057017bf33853f7 100644 (file)
--- a/demos/gtk-demo/tree_store.c
+++ b/demos/gtk-demo/tree_store.c
@@ -402,7 +402,7 @@ do_tree_store (GtkWidget *do_widget)
       gtk_widget_set_margin_end (vbox, 8);
       gtk_widget_set_margin_top (vbox, 8);
       gtk_widget_set_margin_bottom (vbox, 8);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       gtk_container_add (GTK_CONTAINER (vbox),
                           gtk_label_new ("Jonathan's Holiday Card Planning Sheet"));

diff --git a/demos/gtk-demo/video_player.c b/demos/gtk-demo/video_player.c
index 848c28ab48941e827f697912573cb73672fe603a..6a40204c2431e53a1d1bc6da3ae1a59ddbb6ca5c 100644 (file)
--- a/demos/gtk-demo/video_player.c
+++ b/demos/gtk-demo/video_player.c
@@ -71,7 +71,7 @@ do_video_player (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       video = gtk_video_new ();
-      gtk_container_add (GTK_CONTAINER (window), video);
+      gtk_window_set_child (GTK_WINDOW (window), video);
 
       title = gtk_header_bar_new ();
       gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (title), TRUE);

diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
index 08f43062cea56bf6362a10cfb22a1a2693861619..442349672bd8c886f28cdf2dc9c42b9522bba840 100644 (file)
--- a/docs/tools/widgets.c
+++ b/docs/tools/widgets.c
@@ -1126,7 +1126,7 @@ create_headerbar (void)
   view = gtk_text_view_new ();
   gtk_widget_show (view);
   gtk_widget_set_size_request (window, 220, 150);
-  gtk_container_add (GTK_CONTAINER (window), view);
+  gtk_window_set_child (GTK_WINDOW (window), view);
   bar = gtk_header_bar_new ();
   gtk_window_set_titlebar (GTK_WINDOW (window), bar);
   button = gtk_button_new ();

diff --git a/examples/action-namespace.c b/examples/action-namespace.c
index da18e7828bedb89cf34e75c8332281be076fbad4..642b7c8fcaa9619b2b8355f3982c6bda97dec02d 100644 (file)
--- a/examples/action-namespace.c
+++ b/examples/action-namespace.c
@@ -113,7 +113,7 @@ activate (GApplication *app,
   gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (button), G_MENU_MODEL (button_menu));
   gtk_widget_set_halign (GTK_WIDGET (button), GTK_ALIGN_CENTER);
   gtk_widget_set_valign (GTK_WIDGET (button), GTK_ALIGN_START);
-  gtk_container_add (GTK_CONTAINER (win), button);
+  gtk_window_set_child (GTK_WINDOW (window), button);
   gtk_widget_show (win);
 
   g_object_unref (button_menu);

diff --git a/examples/bp/bloatpad.c b/examples/bp/bloatpad.c
index 3cb619eb8fbe37dfb0952b27bce3ec085371c71d..be6bee5aa636a8fd57e7f7b32e82072ddebad125 100644 (file)
--- a/examples/bp/bloatpad.c
+++ b/examples/bp/bloatpad.c
@@ -222,7 +222,7 @@ new_window (GApplication *app,
   gtk_window_set_title (GTK_WINDOW (window), "Bloatpad");
 
   grid = gtk_grid_new ();
-  gtk_container_add (GTK_CONTAINER (window), grid);
+  gtk_window_set_child (GTK_WINDOW (window), grid);
 
   toolbar = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   button = gtk_toggle_button_new ();

diff --git a/examples/drawing.c b/examples/drawing.c
index e00460889fb37d9b0e4789215f13f5dea51d05aa..be45149e5c229d40d6c35101145cde3181a7c605 100644 (file)
--- a/examples/drawing.c
+++ b/examples/drawing.c
@@ -143,7 +143,7 @@ activate (GtkApplication *app,
   g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);
 
   frame = gtk_frame_new (NULL);
-  gtk_container_add (GTK_CONTAINER (window), frame);
+  gtk_window_set_child (GTK_WINDOW (window), frame);
 
   drawing_area = gtk_drawing_area_new ();
   /* set a minimum size */

diff --git a/examples/grid-packing.c b/examples/grid-packing.c
index b6cb0ba334c7ae803df9f833bc6ea6951c5c48e3..dcee10f712d4ca8903daa41d9804f3846ced52ef 100644 (file)
--- a/examples/grid-packing.c
+++ b/examples/grid-packing.c
@@ -23,7 +23,7 @@ activate (GtkApplication *app,
   grid = gtk_grid_new ();
 
   /* Pack the container in the window */
-  gtk_container_add (GTK_CONTAINER (window), grid);
+  gtk_window_set_child (GTK_WINDOW (window), grid);
 
   button = gtk_button_new_with_label ("Button 1");
   g_signal_connect (button, "clicked", G_CALLBACK (print_hello), NULL);

diff --git a/examples/hello-world.c b/examples/hello-world.c
index 4005d66ca9bb114d52953daff4a2da075c50e4b3..ebafc735c6ca3987a9f4bb01871b9ff4b1677edf 100644 (file)
--- a/examples/hello-world.c
+++ b/examples/hello-world.c
@@ -20,7 +20,7 @@ activate (GtkApplication *app,
   gtk_window_set_default_size (GTK_WINDOW (window), 200, 200);
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
 
   button = gtk_button_new_with_label ("Hello World");
   g_signal_connect (button, "clicked", G_CALLBACK (print_hello), NULL);

diff --git a/examples/plugman.c b/examples/plugman.c
index 1b33f0eeb46f2197ed1d5d0a6340d50492edd86d..752e2b9649c62cae8ce89e95f62beb4d79804fee 100644 (file)
--- a/examples/plugman.c
+++ b/examples/plugman.c
@@ -83,7 +83,7 @@ new_window (GApplication *app,
   gtk_window_set_title (GTK_WINDOW (window), "Plugman");
 
   grid = gtk_grid_new ();
-  gtk_container_add (GTK_CONTAINER (window), grid);
+  gtk_window_set_child (GTK_WINDOW (window), grid);
 
   scrolled = gtk_scrolled_window_new (NULL, NULL);
   gtk_widget_set_hexpand (scrolled, TRUE);

diff --git a/examples/search-bar.c b/examples/search-bar.c
index 0a42a925ce277fd57056823fa635d918339c3746..1657b2b8743829247e432d6f037078d479221ebd 100644 (file)
--- a/examples/search-bar.c
+++ b/examples/search-bar.c
@@ -15,7 +15,7 @@ activate_cb (GtkApplication *app,
 
   search_bar = gtk_search_bar_new ();
   gtk_widget_set_valign (search_bar, GTK_ALIGN_START);
-  gtk_container_add (GTK_CONTAINER (window), search_bar);
+  gtk_window_set_child (GTK_WINDOW (window), search_bar);
   gtk_widget_show (search_bar);
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);

diff --git a/examples/sunny.c b/examples/sunny.c
index 86d4d73fc0af9e6b6d983faf55bc7cac662a8858..bd6783145140e511af02bff0a9053de5df9605fe 100644 (file)
--- a/examples/sunny.c
+++ b/examples/sunny.c
@@ -19,7 +19,7 @@ new_window (GApplication *app,
   gtk_window_set_titlebar (GTK_WINDOW (window), header);
 
   overlay = gtk_overlay_new ();
-  gtk_container_add (GTK_CONTAINER (window), overlay);
+  gtk_window_set_child (GTK_WINDOW (window), overlay);
 
   scrolled = gtk_scrolled_window_new (NULL, NULL);
   gtk_widget_set_hexpand (scrolled, TRUE);

diff --git a/gtk/a11y/gtkwindowaccessible.c b/gtk/a11y/gtkwindowaccessible.c
index 19a4da979807c997df5dd326c6c554be3e472737..742cfd2776108b2a7f20d0c8cf4c69a2e3170f97 100644 (file)
--- a/gtk/a11y/gtkwindowaccessible.c
+++ b/gtk/a11y/gtkwindowaccessible.c
@@ -122,14 +122,6 @@ gtk_window_accessible_get_name (AtkObject *accessible)
       GtkWindow *window = GTK_WINDOW (widget);
 
       name = gtk_window_get_title (window);
-      if (name == NULL && accessible->role == ATK_ROLE_TOOL_TIP)
-        {
-          GtkWidget *child;
-
-          child = find_label_child (GTK_CONTAINER (window));
-          if (GTK_IS_LABEL (child))
-            name = gtk_label_get_text (GTK_LABEL (child));
-        }
     }
   return name;
 }

diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c
index 4f1416826e0ae6ead5806e9077bad682f7e995b8..dac7a04b59de5e416e343c1cfdcf92cfb941e9cc 100644 (file)
--- a/gtk/gtkradiobutton.c
+++ b/gtk/gtkradiobutton.c
@@ -114,7 +114,7 @@
  *    // Pack them into a box, then show all the widgets
  *    gtk_container_add (GTK_CONTAINER (box), radio1);
  *    gtk_container_add (GTK_CONTAINER (box), radio2);
- *    gtk_container_add (GTK_CONTAINER (window), box);
+      gtk_window_set_child (GTK_WINDOW (window),box);
  *    gtk_widget_show (window);
  *    return;
  * }

diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index c59ef30ab8cb887229643505d9669a57f5fe8f49..0c790a6fff88549a1aa4a1059e7e5780b0f754ac 100644 (file)
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -144,7 +144,7 @@
  *
  *   // creates the spinbutton, with no decimal places
  *   button = gtk_spin_button_new (adjustment, 1.0, 0);
- *   gtk_container_add (GTK_CONTAINER (window), button);
+ *   gtk_window_set_child (GTK_WINDOW (window), button);
  *
  *   gtk_widget_show (window);
  * }
@@ -175,7 +175,7 @@
  *
  *   // creates the spinbutton, with three decimal places
  *   button = gtk_spin_button_new (adjustment, 0.001, 3);
- *   gtk_container_add (GTK_CONTAINER (window), button);
+ *   gtk_window_set_child (GTK_WINDOW (window), button);
  *
  *   gtk_widget_show (window);
  * }

diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c
index 32e8f3122353720bb83d69152cbcfb9f6f0027f7..da5de35ae54dbab229dbda4187504a2897cc5d8e 100644 (file)
--- a/gtk/gtktogglebutton.c
+++ b/gtk/gtktogglebutton.c
@@ -93,7 +93,7 @@
  *                     NULL);
  *   gtk_container_add (GTK_CONTAINER (box), toggle2);
  *
- *   gtk_container_add (GTK_CONTAINER (window), box);
+ *   gtk_window_set_child (GTK_WINDOW (window), box);
  *   gtk_widget_show (window);
  * }
  * ]|

diff --git a/gtk/inspector/fpsoverlay.c b/gtk/inspector/fpsoverlay.c
index a659c1dcdda1d43dbc72d62780fb46a658ea7989..a1a4168e89273ff3bcfe38661918c88292888340 100644 (file)
--- a/gtk/inspector/fpsoverlay.c
+++ b/gtk/inspector/fpsoverlay.c
@@ -203,7 +203,7 @@ gtk_fps_overlay_snapshot (GtkInspectorOverlay *overlay,
 
   if (GTK_IS_WINDOW (widget))
     {
-      GtkWidget *child = gtk_bin_get_child (GTK_BIN (widget));
+      GtkWidget *child = gtk_window_get_child (GTK_WINDOW (widget));
       if (!child ||
           !gtk_widget_compute_bounds (child, widget, &bounds))
         has_bounds = gtk_widget_compute_bounds (widget, widget, &bounds);

diff --git a/gtk/tools/gtk-builder-tool-preview.c b/gtk/tools/gtk-builder-tool-preview.c
index c1f615757005c9d1b61e745131d9c3ed4465b858..70ca1fac281e021f6e94ea76307dd2b61a76834b 100644 (file)
--- a/gtk/tools/gtk-builder-tool-preview.c
+++ b/gtk/tools/gtk-builder-tool-preview.c
@@ -137,7 +137,7 @@ preview_file (const char *filename,
       g_object_ref (widget);
       if (gtk_widget_get_parent (widget) != NULL)
         gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (widget)), widget);
-      gtk_container_add (GTK_CONTAINER (window), widget);
+      gtk_window_set_child (GTK_WINDOW (window), widget);
       g_object_unref (widget);
     }
 

diff --git a/tests/animated-resizing.c b/tests/animated-resizing.c
index 6ec091264d596a793787473a859e25f9b57b4a7c..b64559f4399a0f1dd8d2bc97157206c984625ce0 100644 (file)
--- a/tests/animated-resizing.c
+++ b/tests/animated-resizing.c
@@ -203,7 +203,7 @@ main(int argc, char **argv)
 
   da = gtk_drawing_area_new ();
   gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), on_draw, NULL, NULL);
-  gtk_container_add (GTK_CONTAINER (window), da);
+  gtk_window_set_child (GTK_WINDOW (window), da);
 
   g_signal_connect (window, "destroy",
                     G_CALLBACK (quit_cb), NULL);

diff --git a/tests/animated-revealing.c b/tests/animated-revealing.c
index a7a4d57674d7ec0945944d99b4bacfc6f2576efc..73c890977b94ec09a7b38ec0a14a1f6b19807905 100644 (file)
--- a/tests/animated-revealing.c
+++ b/tests/animated-revealing.c
@@ -60,7 +60,7 @@ main(int argc, char **argv)
   gtk_revealer_set_reveal_child (GTK_REVEALER (revealer), TRUE);
   g_signal_connect_after (revealer, "map", G_CALLBACK (toggle_reveal), NULL);
   g_signal_connect_after (revealer, "notify::child-revealed", G_CALLBACK (toggle_reveal), NULL);
-  gtk_container_add (GTK_CONTAINER (window), revealer);
+  gtk_window_set_child (GTK_WINDOW (window), revealer);
 
   grid = gtk_grid_new ();
   gtk_container_add (GTK_CONTAINER (revealer), grid);

diff --git a/tests/gdkgears.c b/tests/gdkgears.c
index 4c5bb0725d3c9419bdec188cbf9905ad15eb5890..eba165b59571c9fff003b5fcb8c6746a2eae22d4 100644 (file)
--- a/tests/gdkgears.c
+++ b/tests/gdkgears.c
@@ -141,7 +141,7 @@ main (int argc, char *argv[])
   gtk_widget_set_margin_top (overlay, 12);
   gtk_widget_set_margin_bottom (overlay, 12);
 
-  gtk_container_add (GTK_CONTAINER (window), overlay);
+  gtk_window_set_child (GTK_WINDOW (window), overlay);
   gtk_widget_show (overlay);
 
   revealer = gtk_revealer_new ();

diff --git a/tests/listmodel.c b/tests/listmodel.c
index f4d88fe4779333696e02e36c89f42096c76276c8..aaaabab9d177bab89c451cee5bc1d69eb6d110b2 100644 (file)
--- a/tests/listmodel.c
+++ b/tests/listmodel.c
@@ -192,7 +192,7 @@ main (int argc, char *argv[])
 
   window = gtk_window_new ();
   grid = gtk_grid_new ();
-  gtk_container_add (GTK_CONTAINER (window), grid);
+  gtk_window_set_child (GTK_WINDOW (window), grid);
   sw = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                   GTK_POLICY_AUTOMATIC,

diff --git a/tests/motion-compression.c b/tests/motion-compression.c
index b528395bb88c396f82dc309b2a056de43a34f82a..caba2bca3f5050c7a1e6eadfda7bbbfe4b35493c 100644 (file)
--- a/tests/motion-compression.c
+++ b/tests/motion-compression.c
@@ -62,7 +62,7 @@ main (int argc, char **argv)
   gtk_window_set_default_size (GTK_WINDOW (window), 300, 300);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_container_add (GTK_CONTAINER (window), vbox);
+  gtk_window_set_child (GTK_WINDOW (window), vbox);
 
   da = gtk_drawing_area_new ();
   gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), on_draw, NULL, NULL);

diff --git a/tests/overlayscroll.c b/tests/overlayscroll.c
index 4cb8e18f4668a8384cce43151442771596b50bf8..2aaabb3710407ddab0ceca6446d896e151a6d57c 100644 (file)
--- a/tests/overlayscroll.c
+++ b/tests/overlayscroll.c
@@ -70,7 +70,7 @@ main (int argc, char *argv[])
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 20);
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
 
   sw = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),

diff --git a/tests/scrolling-performance.c b/tests/scrolling-performance.c
index db2fae820ea592c948826ee4c07d814d2c9cf41d..96fc298542a567647f75976c648416229e5b8317 100644 (file)
--- a/tests/scrolling-performance.c
+++ b/tests/scrolling-performance.c
@@ -132,7 +132,7 @@ main (int argc, char **argv)
   gtk_window_set_default_size (GTK_WINDOW (window), 800, 600);
 
   scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-  gtk_container_add (GTK_CONTAINER (window), scrolled_window);
+  gtk_window_set_child (GTK_WINDOW (window), scrolled_window);
 
   viewport = gtk_viewport_new (NULL, NULL);
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window), viewport);

diff --git a/tests/showrendernode.c b/tests/showrendernode.c
index 02e30e7ca2ff60951e0dba960a177fb34a4f3afe..1f54217073049a782969be25c2709b8c0c43b8a6 100644 (file)
--- a/tests/showrendernode.c
+++ b/tests/showrendernode.c
@@ -218,7 +218,7 @@ main (int argc, char **argv)
 
       gtk_container_add (GTK_CONTAINER (box), nodeview);
       gtk_container_add (GTK_CONTAINER (box), image);
-      gtk_container_add (GTK_CONTAINER (window), box);
+      gtk_window_set_child (GTK_WINDOW (window), box);
 
       gsk_renderer_unrealize (renderer);
       g_object_unref (texture);
@@ -227,7 +227,7 @@ main (int argc, char **argv)
     }
   else
     {
-      gtk_container_add (GTK_CONTAINER (window), nodeview);
+      gtk_window_set_child (GTK_WINDOW (window), nodeview);
     }
 
   gsk_render_node_get_bounds (GTK_NODE_VIEW (nodeview)->node, &node_bounds);

diff --git a/tests/simple.c b/tests/simple.c
index 5cabb59cf52eafe0159198b21f24d2437599ab2b..2bf39223bcccc6017bec697f0e78dcd377b8a07c 100644 (file)
--- a/tests/simple.c
+++ b/tests/simple.c
@@ -53,7 +53,7 @@ main (int argc, char *argv[])
   gtk_button_set_label (GTK_BUTTON (button), "hello world");
   g_signal_connect (button, "clicked", G_CALLBACK (hello), NULL);
 
-  gtk_container_add (GTK_CONTAINER (window), button);
+  gtk_window_set_child (GTK_WINDOW (window), button);
 
   gtk_widget_show (window);
 

diff --git a/tests/syncscroll.c b/tests/syncscroll.c
index aae34874135a929d181bbe6a4f7e4dbb32c0f0c3..4a0a8c6103d525d6f5c64054261a700a498a42e7 100644 (file)
--- a/tests/syncscroll.c
+++ b/tests/syncscroll.c
@@ -26,7 +26,7 @@ main (int argc, char *argv[])
   gtk_window_set_default_size (GTK_WINDOW (win), 640, 480);
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
-  gtk_container_add (GTK_CONTAINER (win), box);
+  gtk_window_set_child (GTK_WINDOW (win), box);
 
   sw = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),

diff --git a/tests/testaccel.c b/tests/testaccel.c
index 0dc121d7b537d7af9aa8bb574c36efd68e56c6dd..5a7ddd140ca9791af4873e068b103318dc48bf71 100644 (file)
--- a/tests/testaccel.c
+++ b/tests/testaccel.c
@@ -74,7 +74,7 @@ key_test (void)
         gtk_widget_set_hexpand (sw, TRUE);
         box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
         gtk_widget_show (box);
-       gtk_container_add (GTK_CONTAINER (window), box);
+        gtk_window_set_child (GTK_WINDOW (window), box);
         gtk_container_add (GTK_CONTAINER (box), sw);
 
        store = gtk_list_store_new (3, G_TYPE_INT, G_TYPE_UINT, G_TYPE_UINT);

diff --git a/tests/testadjustsize.c b/tests/testadjustsize.c
index bdb506ee86b100d28a0c2699bc0bb51da6c6e74e..2f5c227ef039276a62370a4da685ce972ce820d6 100644 (file)
--- a/tests/testadjustsize.c
+++ b/tests/testadjustsize.c
@@ -89,7 +89,7 @@ open_test_window (void)
 
   grid = gtk_grid_new ();
 
-  gtk_container_add (GTK_CONTAINER (test_window), grid);
+  gtk_window_set_child (GTK_WINDOW (test_window), grid);
 
   for (i = 0; i < TEST_WIDGET_LAST; ++i)
     {
@@ -146,7 +146,7 @@ open_control_window (void)
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
 
   toggle =
     gtk_toggle_button_new_with_label ("Set small size requests");
@@ -253,7 +253,7 @@ open_alignment_window (void)
   gtk_grid_set_row_homogeneous (GTK_GRID (grid), TRUE);
   gtk_grid_set_column_homogeneous (GTK_GRID (grid), TRUE);
 
-  gtk_container_add (GTK_CONTAINER (test_window), grid);
+  gtk_window_set_child (GTK_WINDOW (test_window), grid);
 
   for (i = 0; i < align_class->n_values; ++i)
     {
@@ -308,7 +308,7 @@ open_margin_window (void)
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 
-  gtk_container_add (GTK_CONTAINER (test_window), box);
+  gtk_window_set_child (GTK_WINDOW (test_window), box);
 
   for (i = 0; i < (int) G_N_ELEMENTS (margins); ++i)
     {
@@ -332,7 +332,7 @@ open_valigned_label_window (void)
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_widget_show (box);
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
 
   label = gtk_label_new ("Both labels expand");
   gtk_widget_show (label);

diff --git a/tests/testassistant.c b/tests/testassistant.c
index 365e8bd9f3243b603f4f7529f05681327e0ef975..2d010753d3790514c0aedf689dfb87ce712fddde 100644 (file)
--- a/tests/testassistant.c
+++ b/tests/testassistant.c
@@ -719,7 +719,7 @@ main (int argc, gchar *argv[])
   g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (quit_cb), &done);
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
 
   for (i = 0; i < G_N_ELEMENTS (buttons); i++)
     {

diff --git a/tests/testbaseline.c b/tests/testbaseline.c
index 7d9551ea3a2c836b7727cd32d3eb86bdc6d236e5..ba1129d4cc8bee7ee7d37c288080971db667a8fa 100644 (file)
--- a/tests/testbaseline.c
+++ b/tests/testbaseline.c
@@ -103,7 +103,7 @@ main (int    argc,
   g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (quit_cb), &done);
 
   notebook = gtk_notebook_new ();
-  gtk_container_add (GTK_CONTAINER (window), notebook);
+  gtk_window_set_child (GTK_WINDOW (window), notebook);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
   gtk_notebook_append_page (GTK_NOTEBOOK (notebook),

diff --git a/tests/testblur.c b/tests/testblur.c
index 6baf0b01f9984a31a4c2a497f6785942c731ac70..21fa7774ae39995c61cf0db33ea109ae1ccbafff 100644 (file)
--- a/tests/testblur.c
+++ b/tests/testblur.c
@@ -124,7 +124,7 @@ main (int argc, char **argv)
   g_signal_connect (scale, "value-changed", G_CALLBACK (value_changed_cb2), value_label);
 
   gtk_container_add (GTK_CONTAINER (blur_box), scale);
-  gtk_container_add (GTK_CONTAINER (window), blur_box);
+  gtk_window_set_child (GTK_WINDOW (window), blur_box);
 
   gtk_widget_show (window);
 

diff --git a/tests/testborderdrawing.c b/tests/testborderdrawing.c
index 9456649d2cfb742f129789cd4ff0dff96a41973f..68bba9590254f23a672a51559c5040c64e4f9ab6 100644 (file)
--- a/tests/testborderdrawing.c
+++ b/tests/testborderdrawing.c
@@ -164,7 +164,7 @@ main (int argc, char **argv)
 
   gtk_container_add (GTK_CONTAINER (box), top);
   gtk_container_add (GTK_CONTAINER (box), bottom);
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
   gtk_widget_show (window);
 

diff --git a/tests/testbox.c b/tests/testbox.c
index db28fdd4e15029f65da56d8c2c92229cb2fcf994..1d91d6714d70985721c538470b0dee52d79d172f 100644 (file)
--- a/tests/testbox.c
+++ b/tests/testbox.c
@@ -89,7 +89,7 @@ main (int argc, char *argv[])
   window = gtk_window_new ();
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_container_add (GTK_CONTAINER (window), vbox);
+  gtk_window_set_child (GTK_WINDOW (window), vbox);
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_container_add (GTK_CONTAINER (box), test_widget ("1"));

diff --git a/tests/testbuttons.c b/tests/testbuttons.c
index 417db54230add30c1d16e13af9ad39cde703f596..08f4418e291880911b5ee9bd862df8a42c6b1451 100644 (file)
--- a/tests/testbuttons.c
+++ b/tests/testbuttons.c
@@ -33,7 +33,7 @@ int main (int argc, char *argv[])
 
        box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
-       gtk_container_add (GTK_CONTAINER (window), box);
+        gtk_window_set_child (GTK_WINDOW (window), box);
 
        hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
        gtk_container_add (GTK_CONTAINER (box), hbox);

diff --git a/tests/testcairo.c b/tests/testcairo.c
index a6d661d678b6474fea077c21ce103b88ee7a0524..4939738057f2107ff00b81e0b5518c3b63f7b7a9 100644 (file)
--- a/tests/testcairo.c
+++ b/tests/testcairo.c
@@ -209,7 +209,7 @@ main (int argc, char **argv)
   gtk_window_set_title (GTK_WINDOW (window), "cairo: Knockout Groups");
 
   darea = gtk_drawing_area_new ();
-  gtk_container_add (GTK_CONTAINER (window), darea);
+  gtk_window_set_child (GTK_WINDOW (window), darea);
 
   gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (darea), on_draw, NULL, NULL);
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);

diff --git a/tests/testcalendar.c b/tests/testcalendar.c
index c453f7bec385a0f71a993f6ef86d5c3950db2422..978316d88d2b657259aabf209a48cb387497006e 100644 (file)
--- a/tests/testcalendar.c
+++ b/tests/testcalendar.c
@@ -303,7 +303,7 @@ create_calendar(void)
   gtk_container_add (GTK_CONTAINER (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));
   gtk_container_add (GTK_CONTAINER (vbox), bbox);
 
-  gtk_container_add (GTK_CONTAINER (window), vbox);
+  gtk_window_set_child (GTK_WINDOW (window), vbox);
 
   gtk_window_set_default_widget (GTK_WINDOW (window), button);
 

diff --git a/tests/testcellarea.c b/tests/testcellarea.c
index 9e538ac53aa65f2de9a117cc60789c7939881132..1726b1580712a4bf0e6ad94f44e38229798e7e13 100644 (file)
--- a/tests/testcellarea.c
+++ b/tests/testcellarea.c
@@ -252,7 +252,7 @@ simple_cell_area (void)
   g_signal_connect (G_OBJECT (widget), "toggled",
                     G_CALLBACK (expand_cell_3_toggled), iconview);
 
-  gtk_container_add (GTK_CONTAINER (window), hbox);
+  gtk_window_set_child (GTK_WINDOW (window), hbox);
 
   gtk_widget_show (window);
 }
@@ -462,7 +462,7 @@ focus_cell_area (void)
   g_signal_connect (G_OBJECT (widget), "toggled",
                     G_CALLBACK (focus_sibling_toggled), iconview);
 
-  gtk_container_add (GTK_CONTAINER (window), hbox);
+  gtk_window_set_child (GTK_WINDOW (window), hbox);
 
   gtk_widget_show (window);
 }
@@ -517,7 +517,7 @@ background_area (void)
   main_vbox  = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_widget_show (hbox);
   gtk_widget_show (main_vbox);
-  gtk_container_add (GTK_CONTAINER (window), main_vbox);
+  gtk_window_set_child (GTK_WINDOW (window), main_vbox);
 
   gtk_window_set_title (GTK_WINDOW (window), "Background Area");
 

diff --git a/tests/testcellrenderertext.c b/tests/testcellrenderertext.c
index c5ec0a08cec75e7e6871f1d7e5dfb6ac6a0fdd53..87f424330c39b5d74cc9ca8f77df7d9cabaf0401 100644 (file)
--- a/tests/testcellrenderertext.c
+++ b/tests/testcellrenderertext.c
@@ -273,7 +273,7 @@ main (int argc, char **argv)
                    G_CALLBACK (quit_cb), &done);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-  gtk_container_add (GTK_CONTAINER (window), vbox);
+  gtk_window_set_child (GTK_WINDOW (window), vbox);
 
   /* LTR */
 

diff --git a/tests/testcenterbox.c b/tests/testcenterbox.c
index 9c3412795b633dfad4e13d0f176f78fce50bc094..0b420baea49fa3dcc5af17d278277b0021299433 100644 (file)
--- a/tests/testcenterbox.c
+++ b/tests/testcenterbox.c
@@ -26,7 +26,7 @@ main (int argc, char *argv[])
 
   window = gtk_window_new ();
   box = gtk_center_box_new ();
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
 
   child = gtk_label_new ("Start Start Start Start Start");
   gtk_label_set_ellipsize (GTK_LABEL (child), PANGO_ELLIPSIZE_END);

diff --git a/tests/testclipboard2.c b/tests/testclipboard2.c
index 7ea34e9bf7f6f3b4bba33609bbdb68b62acd8372..7c93c302dffb96f0d90e5f245975215392d04481 100644 (file)
--- a/tests/testclipboard2.c
+++ b/tests/testclipboard2.c
@@ -448,7 +448,7 @@ main (int argc, char **argv)
 
   window = gtk_window_new ();
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
-  gtk_container_add (GTK_CONTAINER (window),
+  gtk_window_set_child (GTK_WINDOW (window),
                      get_window_contents (gtk_widget_get_display (window),
                                           alt_display));
 

diff --git a/tests/testcombo.c b/tests/testcombo.c
index cdcb1d41a08b92e2c39c7ae0bc1fef7a7c2606a2..51aae6a30096b488a93d8bcbf107890dbbb3cb4a 100644 (file)
--- a/tests/testcombo.c
+++ b/tests/testcombo.c
@@ -954,7 +954,7 @@ main (int argc, char **argv)
         g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
 
         mainbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
-        gtk_container_add (GTK_CONTAINER (window), mainbox);
+        gtk_window_set_child (GTK_WINDOW (window), mainbox);
 
         /* GtkCellView */
         tmp = gtk_frame_new ("GtkCellView");

diff --git a/tests/testdialog.c b/tests/testdialog.c
index 7b68f8a15d5d7469f2f9bd494b57feeb8fa48cd5..57b99a8690593af70c2dc99f68cba9500f1ab0b3 100644 (file)
--- a/tests/testdialog.c
+++ b/tests/testdialog.c
@@ -335,7 +335,7 @@ main (int argc, char *argv[])
   gtk_widget_set_halign (vbox, GTK_ALIGN_FILL);
   gtk_widget_set_valign (vbox, GTK_ALIGN_CENTER);
   gtk_widget_show (vbox);
-  gtk_container_add (GTK_CONTAINER (window), vbox);
+  gtk_window_set_child (GTK_WINDOW (window), vbox);
   
   box = gtk_flow_box_new ();
   gtk_flow_box_set_selection_mode (GTK_FLOW_BOX (box), GTK_SELECTION_NONE);

diff --git a/tests/testdnd.c b/tests/testdnd.c
index 7f4f1626cb67e9f0624316b4bbe9c833d4395bc1..f6659a54c4674e53bb4a28440b6a5ec17af9a4d9 100644 (file)
--- a/tests/testdnd.c
+++ b/tests/testdnd.c
@@ -538,7 +538,7 @@ main (int argc, char **argv)
 
   
   grid = gtk_grid_new ();
-  gtk_container_add (GTK_CONTAINER (window), grid);
+  gtk_window_set_child (GTK_WINDOW (window), grid);
 
   drag_icon = gdk_pixbuf_new_from_xpm_data (drag_icon_xpm);
   texture = gdk_texture_new_for_pixbuf (drag_icon);

diff --git a/tests/testdnd2.c b/tests/testdnd2.c
index e2b3bb6d30108cf34ff31c5398c5ea90d6c32673..e02dea97a45f6f59c787b375fe36d795c444b41b 100644 (file)
--- a/tests/testdnd2.c
+++ b/tests/testdnd2.c
@@ -415,7 +415,7 @@ main (int argc, char *Argv[])
                 "row-spacing", 20,
                 "column-spacing", 20,
                 NULL);
-  gtk_container_add (GTK_CONTAINER (window), grid);
+  gtk_window_set_child (GTK_WINDOW (window), grid);
   gtk_grid_attach (GTK_GRID (grid), make_image ("dialog-warning", TOP_LEFT), 0, 0, 1, 1);
   gtk_grid_attach (GTK_GRID (grid), make_image ("process-stop", BOTTOM_RIGHT), 1, 0, 1, 1);
 

diff --git a/tests/testdnd3.c b/tests/testdnd3.c
index 6234799b00285ff78beeae7a5a4b0107fc89cf22..06f8c77bc0b01ebc31dc5b02d54a3a0941a85bdc 100644 (file)
--- a/tests/testdnd3.c
+++ b/tests/testdnd3.c
@@ -272,7 +272,7 @@ int main (int argc, char *argv[])
   gtk_window_set_default_size (GTK_WINDOW (window), 640, 480);
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
 
   box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_container_add (GTK_CONTAINER (box), box2);

diff --git a/tests/testellipsise.c b/tests/testellipsise.c
index 616caf396973caa5235455df117765801938992c..0e2301625cd4f29327c8ca247a24e3045f07be34 100644 (file)
--- a/tests/testellipsise.c
+++ b/tests/testellipsise.c
@@ -119,7 +119,7 @@ main (int argc, char *argv[])
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-  gtk_container_add (GTK_CONTAINER (window), vbox);
+  gtk_window_set_child (GTK_WINDOW (window), vbox);
 
   combo = gtk_combo_box_text_new ();
   scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL,

diff --git a/tests/testemblems.c b/tests/testemblems.c
index a98193c0a4dae46f0951b0a2853e95d7b50c8176..d94b56cafa636e36ddfe0d4a5a91f85e1290cad6 100644 (file)
--- a/tests/testemblems.c
+++ b/tests/testemblems.c
@@ -15,7 +15,7 @@ int main (int argc, char **argv)
        grid = gtk_grid_new ();
        gtk_grid_set_row_spacing (GTK_GRID (grid), 12);
        gtk_grid_set_column_spacing (GTK_GRID (grid), 12);
-       gtk_container_add (GTK_CONTAINER (window), grid);
+        gtk_window_set_child (GTK_WINDOW (window), grid);
 
         icon = g_themed_icon_new ("folder");
         button = gtk_image_new_from_gicon (icon);

diff --git a/tests/testentrycompletion.c b/tests/testentrycompletion.c
index 39bd22719d66cc4e3b5d103e3a0d4b81d6dc265f..2f726b53efe239ff1db83bbc488863596499b61c 100644 (file)
--- a/tests/testentrycompletion.c
+++ b/tests/testentrycompletion.c
@@ -314,7 +314,7 @@ main (int argc, char *argv[])
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
   
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
-  gtk_container_add (GTK_CONTAINER (window), vbox);
+  gtk_window_set_child (GTK_WINDOW (window), vbox);
     
   label = gtk_label_new (NULL);
 

diff --git a/tests/testentryicons.c b/tests/testentryicons.c
index 5856f48fd9a6d46f5b1eeaaa030e9c6d80ed8401..3d6a4fdbea0e9c0b1e737c0d64b0e563e4941f0b 100644 (file)
--- a/tests/testentryicons.c
+++ b/tests/testentryicons.c
@@ -111,7 +111,7 @@ main (int argc, char **argv)
                    G_CALLBACK (quit_cb), &done);
 
   grid = gtk_grid_new ();
-  gtk_container_add (GTK_CONTAINER (window), grid);
+  gtk_window_set_child (GTK_WINDOW (window), grid);
   gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
   gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
   gtk_widget_set_margin_start (grid, 10);

diff --git a/tests/testexpand.c b/tests/testexpand.c
index a6d20d80442421874f9896998ac05ce580857997..131eea5b2d1c833068253b0be909889fdcc3a5cd 100644 (file)
--- a/tests/testexpand.c
+++ b/tests/testexpand.c
@@ -101,7 +101,7 @@ create_box_window (void)
   gtk_container_add (GTK_CONTAINER (box3),
                      gtk_label_new ("VBox 3 Bottom"));
 
-  gtk_container_add (GTK_CONTAINER (window), box1);
+  gtk_window_set_child (GTK_WINDOW (window), box1);
   gtk_widget_show (window);
 }
 
@@ -153,7 +153,7 @@ create_grid_window (void)
 
   gtk_grid_attach (GTK_GRID (grid), colorbox, 1, 2, 1, 1); 
 
-  gtk_container_add (GTK_CONTAINER (window), grid);
+  gtk_window_set_child (GTK_WINDOW (window), grid);
   gtk_widget_show (window);
 }
 

diff --git a/tests/testflowbox.c b/tests/testflowbox.c
index 9421409f3d67acb71de2230a0b51ddcfc8090bf5..30ae1c0b90ebf817f5723e568023c3944bf0d14d 100644 (file)
--- a/tests/testflowbox.c
+++ b/tests/testflowbox.c
@@ -386,7 +386,7 @@ create_window (void)
 
   gtk_widget_show (vbox);
   gtk_widget_show (hbox);
-  gtk_container_add (GTK_CONTAINER (window), hbox);
+  gtk_window_set_child (GTK_WINDOW (window), hbox);
   gtk_container_add (GTK_CONTAINER (hbox), vbox);
 
   swindow = gtk_scrolled_window_new (NULL, NULL);

diff --git a/tests/testfontchooser.c b/tests/testfontchooser.c
index f48651941cbb720c6824baa9d20c4ce68d71b842..dedb011f9b41c93bd6e1db4436a851f89b7659cd 100644 (file)
--- a/tests/testfontchooser.c
+++ b/tests/testfontchooser.c
@@ -80,7 +80,7 @@ main (int argc, char *argv[])
   window = gtk_window_new ();
   gtk_widget_set_size_request (window, 600, 600);
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
   gtk_container_add (GTK_CONTAINER (box), fontchooser);
 
   gtk_widget_show (window);

diff --git a/tests/testfontchooserdialog.c b/tests/testfontchooserdialog.c
index 9468953d735375463505395d11daa7d44bab023a..318baeb5b9a7370d47bcf2aa70bbe92e8838c26f 100644 (file)
--- a/tests/testfontchooserdialog.c
+++ b/tests/testfontchooserdialog.c
@@ -107,7 +107,7 @@ main (int argc, char *argv[])
   gtk_font_button_set_use_font (GTK_FONT_BUTTON (font_button), TRUE);
 
   window = gtk_window_new ();
-  gtk_container_add (GTK_CONTAINER (window), font_button);
+  gtk_window_set_child (GTK_WINDOW (window), font_button);
   gtk_widget_show (window);
 
   g_signal_connect (font_button, "notify::font",

diff --git a/tests/testfontoptions.c b/tests/testfontoptions.c
index fdcd4bf6ea37b7596a27cb821044a2289242cd65..e47d89c391c045dae73c4ad17ca5be92fba65579 100644 (file)
--- a/tests/testfontoptions.c
+++ b/tests/testfontoptions.c
@@ -38,7 +38,7 @@ main (int argc, char *argv[])
   grid = gtk_grid_new ();
   gtk_grid_set_row_spacing (GTK_GRID (grid), 10);
   gtk_grid_set_column_spacing (GTK_GRID (grid), 10);
-  gtk_container_add (GTK_CONTAINER (window), grid);
+  gtk_window_set_child (GTK_WINDOW (window), grid);
   label = gtk_label_new ("Default font options");
   gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 2, 1);
   demo = gtk_label_new ("Custom font options");

diff --git a/tests/testframe.c b/tests/testframe.c
index 45d4a51315409cae0d543bdc6eff060510b9b8bf..f52e0caebae5e9658b3664a3ad0dd118fe8fa52a 100644 (file)
--- a/tests/testframe.c
+++ b/tests/testframe.c
@@ -75,7 +75,7 @@ int main (int argc, char **argv)
   gtk_widget_set_margin_end (GTK_WIDGET (vbox), 12);
   gtk_widget_set_margin_top (GTK_WIDGET (vbox), 12);
   gtk_widget_set_margin_bottom (GTK_WIDGET (vbox), 12);
-  gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (vbox));
+  gtk_window_set_child (GTK_WINDOW (window), GTK_WIDGET (vbox));
 
   frame = GTK_FRAME (gtk_frame_new ("Test GtkFrame"));
   gtk_widget_set_vexpand (GTK_WIDGET (frame), TRUE);

diff --git a/tests/testfullscreen.c b/tests/testfullscreen.c
index e22d190ce5988ff6c2b6d25234b96737a0668fcf..4a1e2ec2ec7218568ac8ded903921c3000c90a07 100644 (file)
--- a/tests/testfullscreen.c
+++ b/tests/testfullscreen.c
@@ -74,7 +74,7 @@ main (int argc, char *argv[])
   gtk_widget_set_valign (vbox, GTK_ALIGN_CENTER);
   gtk_widget_set_halign (vbox, GTK_ALIGN_CENTER);
   gtk_box_set_homogeneous (GTK_BOX (vbox), TRUE);
-  gtk_container_add (GTK_CONTAINER (window), vbox);
+  gtk_window_set_child (GTK_WINDOW (window), vbox);
 
   button = gtk_button_new_with_label ("Fullscreen on current monitor");
   g_signal_connect (button, "clicked", G_CALLBACK (set_fullscreen_monitor_cb), GINT_TO_POINTER (GDK_FULLSCREEN_ON_CURRENT_MONITOR));

diff --git a/tests/testgaction.c b/tests/testgaction.c
index 0800a15eb04b4f04f208ff3846d362e69a616b8a..616fee0bf6c900f0e5c5a930038965ab32cbfd12 100644 (file)
--- a/tests/testgaction.c
+++ b/tests/testgaction.c
@@ -142,7 +142,7 @@ int main (int argc, char **argv)
   gtk_actionable_set_action_name (GTK_ACTIONABLE (button1), "win.change-label-button");
   gtk_container_add (GTK_CONTAINER (box), button1);
 
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
 
   gtk_widget_show (window);
   while (TRUE)

diff --git a/tests/testglarea.c b/tests/testglarea.c
index 637e54488d91a910aeebc333c4d14551a0bfad4a..b32aa2cab0bbb77306e7df49b010b610c5cc8b49 100644 (file)
--- a/tests/testglarea.c
+++ b/tests/testglarea.c
@@ -422,7 +422,7 @@ main (int argc, char *argv[])
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE);
   gtk_box_set_spacing (GTK_BOX (box), 6);
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
   gtk_widget_show (box);
 
   gl_area = gtk_gl_area_new ();

diff --git a/tests/testglblending.c b/tests/testglblending.c
index a20c18eb63554f9d2109f28f9f46746689e6d39e..01fb874bed9ed2c2295b38410a5ddfe7db799bdb 100644 (file)
--- a/tests/testglblending.c
+++ b/tests/testglblending.c
@@ -28,7 +28,7 @@ main (int argc, char *argv[])
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
 
   fixed = gtk_fixed_new ();
-  gtk_container_add (GTK_CONTAINER (window), fixed);
+  gtk_window_set_child (GTK_WINDOW (window), fixed);
 
   spinner = gtk_spinner_new ();
   gtk_spinner_start (GTK_SPINNER (spinner));

diff --git a/tests/testgmenu.c b/tests/testgmenu.c
index 87134a124c8fc0c05eec52d61af155603fd3d700..f4355609678af6fa7170e56da10ab9c083ee3bf7 100644 (file)
--- a/tests/testgmenu.c
+++ b/tests/testgmenu.c
@@ -644,7 +644,7 @@ main (int argc, char *argv[])
   window = gtk_window_new ();
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
 
   bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
 

diff --git a/tests/testgrid.c b/tests/testgrid.c
index c3c33a9f82905eec27fe6fc3fcb63befa2dd1e4a..ba007a89b8368b8fe0feb404fc4d73fce5fab484 100644 (file)
--- a/tests/testgrid.c
+++ b/tests/testgrid.c
@@ -53,7 +53,7 @@ simple_grid (void)
   window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Orientation");
   grid = gtk_grid_new ();
-  gtk_container_add (GTK_CONTAINER (window), grid);
+  gtk_window_set_child (GTK_WINDOW (window), grid);
 
   gesture = gtk_gesture_click_new ();
   g_signal_connect (gesture, "pressed", G_CALLBACK (toggle_orientation), grid);
@@ -98,7 +98,7 @@ text_grid (void)
   window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Height-for-Width");
   paned1 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
-  gtk_container_add (GTK_CONTAINER (window), paned1);
+  gtk_window_set_child (GTK_WINDOW (window), paned1);
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_paned_pack1 (GTK_PANED (paned1), box, TRUE, FALSE);
@@ -140,7 +140,7 @@ box_comparison (void)
   window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Grid vs. Box");
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-  gtk_container_add (GTK_CONTAINER (window), vbox);
+  gtk_window_set_child (GTK_WINDOW (window), vbox);
 
   gtk_container_add (GTK_CONTAINER (vbox), gtk_label_new ("Above"));
   gtk_container_add (GTK_CONTAINER (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));
@@ -203,7 +203,7 @@ empty_line (void)
   window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Empty row");
   grid = gtk_grid_new ();
-  gtk_container_add (GTK_CONTAINER (window), grid);
+  gtk_window_set_child (GTK_WINDOW (window), grid);
 
   gtk_grid_set_row_spacing (GTK_GRID (grid), 10);
   gtk_grid_set_column_spacing (GTK_GRID (grid), 10);
@@ -231,7 +231,7 @@ empty_grid (void)
   window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Empty grid");
   grid = gtk_grid_new ();
-  gtk_container_add (GTK_CONTAINER (window), grid);
+  gtk_window_set_child (GTK_WINDOW (window), grid);
 
   gtk_grid_set_row_spacing (GTK_GRID (grid), 10);
   gtk_grid_set_column_spacing (GTK_GRID (grid), 10);
@@ -262,7 +262,7 @@ scrolling (void)
   viewport = gtk_viewport_new (NULL, NULL);
   grid = gtk_grid_new ();
 
-  gtk_container_add (GTK_CONTAINER (window), sw);
+  gtk_window_set_child (GTK_WINDOW (window), sw);
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), viewport);
   gtk_viewport_set_child (GTK_VIEWPORT (viewport), grid);
 
@@ -301,7 +301,7 @@ insert_cb (GtkButton *button, GtkWidget *window)
   GtkWidget *child;
   gboolean inserted;
 
-  g = GTK_GRID (gtk_bin_get_child (GTK_BIN (window)));
+  g = GTK_GRID (gtk_window_get_child (GTK_WINDOW (window)));
   g1 = GTK_GRID (gtk_grid_get_child_at (g, 0, 0));
   g2 = GTK_GRID (gtk_grid_get_child_at (g, 1, 0));
   g3 = GTK_GRID (gtk_grid_get_child_at (g, 0, 1));
@@ -358,7 +358,7 @@ insert (void)
   g = gtk_grid_new ();
   gtk_grid_set_row_spacing (GTK_GRID (g), 10);
   gtk_grid_set_column_spacing (GTK_GRID (g), 10);
-  gtk_container_add (GTK_CONTAINER (window), g);
+  gtk_window_set_child (GTK_WINDOW (window), g);
 
   grid = gtk_grid_new ();
   gtk_grid_attach (GTK_GRID (g), grid, 0, 0, 1, 1);
@@ -421,7 +421,7 @@ spanning_grid (void)
   gtk_window_set_title (GTK_WINDOW (window), "Spanning");
 
   g = gtk_grid_new ();
-  gtk_container_add (GTK_CONTAINER (window), g);
+  gtk_window_set_child (GTK_WINDOW (window), g);
 
   c = test_widget ("0", "blue");
   gtk_widget_set_hexpand (c, TRUE);

diff --git a/tests/testgridbaseline.c b/tests/testgridbaseline.c
index db4e01b9d6e9ff59e498c4df68b0802c929644dc..e96b5fd612ca94ec5c93b2d1eedc9ad531224e29 100644 (file)
--- a/tests/testgridbaseline.c
+++ b/tests/testgridbaseline.c
@@ -19,7 +19,7 @@ main (int argc, char *argv[])
   grid = gtk_grid_new ();
   gtk_grid_set_row_spacing (GTK_GRID (grid), 30);
   gtk_grid_set_column_spacing (GTK_GRID (grid), 30);
-  gtk_container_add (GTK_CONTAINER (window), grid);
+  gtk_window_set_child (GTK_WINDOW (window), grid);
 
   label1 = gtk_label_new ("Some Text");
   label2 = gtk_label_new ("QQQQQQQQQ");

diff --git a/tests/testgrouping.c b/tests/testgrouping.c
index a1d44468e52a32dec6965555473c510a6b590baa..01bfc3b3f5c73a07097eb60ddd7b99962dd8a3ab 100644 (file)
--- a/tests/testgrouping.c
+++ b/tests/testgrouping.c
@@ -126,7 +126,7 @@ main (int argc, char **argv)
   gtk_window_set_default_size (GTK_WINDOW (window), 320, 480);
 
   sw = gtk_scrolled_window_new (NULL, NULL);
-  gtk_container_add (GTK_CONTAINER (window), sw);
+  gtk_window_set_child (GTK_WINDOW (window), sw);
 
   tv = gtk_tree_view_new_with_model (model);
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), tv);

diff --git a/tests/testgtk.c b/tests/testgtk.c
index f123ed07b1ab4b371e354bc1b06f47f1cc1dfadc..697b4b0b3546f7cb9a627021500c0ce2fe16b65a 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -279,7 +279,7 @@ create_buttons (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (window), "GtkButton");
 
       box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (window), box1);
+      gtk_window_set_child (GTK_WINDOW (window), box1);
 
       grid = gtk_grid_new ();
       gtk_grid_set_row_spacing (GTK_GRID (grid), 5);
@@ -354,7 +354,7 @@ create_toggle_buttons (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (window), "GtkToggleButton");
 
       box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (window), box1);
+      gtk_window_set_child (GTK_WINDOW (window), box1);
 
       box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
       gtk_container_add (GTK_CONTAINER (box1), box2);
@@ -725,7 +725,7 @@ create_statusbar (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (window), "statusbar");
 
       box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (window), box1);
+      gtk_window_set_child (GTK_WINDOW (window), box1);
 
       box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
       gtk_container_add (GTK_CONTAINER (box1), box2);
@@ -941,7 +941,7 @@ static void create_labels (GtkWidget *widget)
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);
 
 
       button = create_sensitivity_control (hbox);
@@ -1235,7 +1235,7 @@ create_pixbuf (GtkWidget *widget)
       gtk_widget_realize(window);
 
       box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (window), box1);
+      gtk_window_set_child (GTK_WINDOW (window), box1);
 
       box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
       gtk_container_add (GTK_CONTAINER (box1), box2);
@@ -1310,7 +1310,7 @@ create_tooltips (GtkWidget *widget)
                              gtk_widget_get_display (widget));
 
       box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (window), box1);
+      gtk_window_set_child (GTK_WINDOW (window), box1);
 
       box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
       gtk_container_add (GTK_CONTAINER (box1), box2);
@@ -1418,7 +1418,7 @@ create_image (GtkWidget *widget)
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
 
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       pack_image (vbox, "Stock Warning Dialog", gtk_image_new_from_icon_name ("dialog-warning"));
 
@@ -1541,7 +1541,7 @@ create_listbox (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (window), "listbox");
 
       hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_container_add (GTK_CONTAINER (window), hbox);
+      gtk_window_set_child (GTK_WINDOW (window), hbox);
 
       scrolled = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
@@ -1786,7 +1786,7 @@ create_modal_window (GtkWidget *widget)
   btnClose = gtk_button_new_with_label ("Close");
 
   /* Pack widgets */
-  gtk_container_add (GTK_CONTAINER (window), box1);
+  gtk_window_set_child (GTK_WINDOW (window), box1);
   gtk_container_add (GTK_CONTAINER (box1), frame1);
   gtk_frame_set_child (GTK_FRAME (frame1), box2);
   gtk_container_add (GTK_CONTAINER (box2), btnColor);
@@ -2130,7 +2130,7 @@ create_entry (GtkWidget *widget)
 
 
       box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (window), box1);
+      gtk_window_set_child (GTK_WINDOW (window), box1);
 
 
       box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
@@ -2226,7 +2226,7 @@ create_expander (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (window), "expander");
 
       box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (window), box1);
+      gtk_window_set_child (GTK_WINDOW (window), box1);
 
       expander = gtk_expander_new ("The Hidden");
 
@@ -2621,7 +2621,7 @@ create_spins (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (window), "GtkSpinButton");
 
       main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-      gtk_container_add (GTK_CONTAINER (window), main_vbox);
+      gtk_window_set_child (GTK_WINDOW (window), main_vbox);
 
       frame = gtk_frame_new ("Not accelerated");
       gtk_container_add (GTK_CONTAINER (main_vbox), frame);
@@ -3063,7 +3063,7 @@ create_cursors (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (window), "Cursors");
 
       main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-      gtk_container_add (GTK_CONTAINER (window), main_vbox);
+      gtk_window_set_child (GTK_WINDOW (window), main_vbox);
 
       vbox = g_object_new (GTK_TYPE_BOX,
                            "orientation", GTK_ORIENTATION_VERTICAL,
@@ -3190,7 +3190,7 @@ create_color_selection (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (window), "GtkColorButton");
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-      gtk_container_add (GTK_CONTAINER (window), hbox);
+      gtk_window_set_child (GTK_WINDOW (window), hbox);
       
       label = gtk_label_new ("Pick a color");
       gtk_container_add (GTK_CONTAINER (hbox), label);
@@ -3367,7 +3367,7 @@ create_font_selection (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (window), "GtkFontButton");
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-      gtk_container_add (GTK_CONTAINER (window), hbox);
+      gtk_window_set_child (GTK_WINDOW (window), hbox);
       
       label = gtk_label_new ("Pick a font");
       gtk_container_add (GTK_CONTAINER (hbox), label);
@@ -3553,7 +3553,7 @@ create_display_screen (GtkWidget *widget)
                    G_CALLBACK (gtk_widget_destroy), NULL);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  gtk_container_add (GTK_CONTAINER (window), vbox);
+  gtk_window_set_child (GTK_WINDOW (window), vbox);
   
   frame = gtk_frame_new ("Select display");
   gtk_container_add (GTK_CONTAINER (vbox), frame);
@@ -3637,7 +3637,7 @@ create_range_controls (GtkWidget *widget)
 
 
       box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (window), box1);
+      gtk_window_set_child (GTK_WINDOW (window), box1);
       gtk_widget_show (box1);
 
 
@@ -4017,7 +4017,7 @@ create_notebook (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (window), "notebook");
 
       box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (window), box1);
+      gtk_window_set_child (GTK_WINDOW (window), box1);
 
       sample_notebook = gtk_notebook_new ();
       g_signal_connect (sample_notebook, "switch_page",
@@ -4216,7 +4216,7 @@ create_panes (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (window), "Panes");
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
       gtk_container_add (GTK_CONTAINER (vbox), vpaned);
@@ -4296,7 +4296,7 @@ paned_keyboard_window1 (GtkWidget *widget)
                          gtk_widget_get_display (widget));
 
   hpaned1 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
-  gtk_container_add (GTK_CONTAINER (window1), hpaned1);
+  gtk_window_set_child (GTK_WINDOW (window1), hpaned1);
 
   frame1 = gtk_frame_new (NULL);
   gtk_paned_pack1 (GTK_PANED (hpaned1), frame1, FALSE, TRUE);
@@ -4377,7 +4377,7 @@ paned_keyboard_window2 (GtkWidget *widget)
                          gtk_widget_get_display (widget));
 
   hpaned2 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
-  gtk_container_add (GTK_CONTAINER (window2), hpaned2);
+  gtk_window_set_child (GTK_WINDOW (window2), hpaned2);
 
   frame6 = gtk_frame_new (NULL);
   gtk_paned_pack1 (GTK_PANED (hpaned2), frame6, FALSE, TRUE);
@@ -4436,7 +4436,7 @@ paned_keyboard_window3 (GtkWidget *widget)
 
 
   vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_container_add (GTK_CONTAINER (window3), vbox2);
+  gtk_window_set_child (GTK_WINDOW (window3), vbox2);
 
   label1 = gtk_label_new ("Three panes nested inside each other");
   gtk_container_add (GTK_CONTAINER (vbox2), label1);
@@ -4506,7 +4506,7 @@ paned_keyboard_window4 (GtkWidget *widget)
                         gtk_widget_get_display (widget));
 
   vbox3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_container_add (GTK_CONTAINER (window4), vbox3);
+  gtk_window_set_child (GTK_WINDOW (window4), vbox3);
 
   label2 = gtk_label_new ("Widget tree:\n\nhpaned \n - vpaned\n - hbox\n    - vpaned\n    - vpaned\n    - vpaned\n");
   gtk_container_add (GTK_CONTAINER (vbox3), label2);
@@ -4669,7 +4669,7 @@ create_wmhints (GtkWidget *widget)
       g_object_unref (pixbuf);
 
       box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (window), box1);
+      gtk_window_set_child (GTK_WINDOW (window), box1);
       gtk_widget_show (box1);
 
       label = gtk_label_new ("Try iconizing me!");
@@ -4901,7 +4901,7 @@ create_surface_states (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (window), "Window states");
       
       box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (window), box1);
+      gtk_window_set_child (GTK_WINDOW (window), box1);
 
       iconified = gtk_window_new ();
 
@@ -5885,7 +5885,7 @@ create_native_dialogs (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW(window), "Native dialog parent");
 
       box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-      gtk_container_add (GTK_CONTAINER (window), box);
+      gtk_window_set_child (GTK_WINDOW (window), box);
 
       label = gtk_label_new ("");
       gtk_container_add (GTK_CONTAINER (box), label);
@@ -6043,7 +6043,7 @@ create_main_window (void)
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
 
   box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_container_add (GTK_CONTAINER (window), box1);
+  gtk_window_set_child (GTK_WINDOW (window), box1);
 
   if (gtk_get_micro_version () > 0)
     sprintf (buffer,

diff --git a/tests/testheaderbar.c b/tests/testheaderbar.c
index 8fea9d36ac4077aa8655b6de1c44b0ea146308ad..539ed3bbae3d66742a35e773c07d072c8174babf 100644 (file)
--- a/tests/testheaderbar.c
+++ b/tests/testheaderbar.c
@@ -139,7 +139,7 @@ main (int argc, char *argv[])
   change_header (NULL, window);
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
 
   content = gtk_image_new_from_icon_name ("start-here-symbolic");
   gtk_image_set_pixel_size (GTK_IMAGE (content), 512);

diff --git a/tests/testheightforwidth.c b/tests/testheightforwidth.c
index ae4ae9cc13846715946b7fc7c294f7ce809f27e9..41c62f24b626a0bf80d30eecf8565d8d3c4a2f0c 100644 (file)
--- a/tests/testheightforwidth.c
+++ b/tests/testheightforwidth.c
@@ -816,7 +816,7 @@ create_window (void)
   gtk_widget_set_margin_top (vbox, 8);
   gtk_widget_set_margin_bottom (vbox, 8);
 
-  gtk_container_add (GTK_CONTAINER (window), vbox);
+  gtk_window_set_child (GTK_WINDOW (window), vbox);
 
   for (i = 0; i < G_N_ELEMENTS (interfaces); i++)
     {

diff --git a/tests/testhover.c b/tests/testhover.c
index 7b846b6b29ec68f023ac1ade8e2abecd1449a598..daf4c1cb0798ddcb50c4cc8ebdd31dadadbfb657 100644 (file)
--- a/tests/testhover.c
+++ b/tests/testhover.c
@@ -109,7 +109,7 @@ test1 (void)
   gtk_window_set_title (GTK_WINDOW (win), "add/remove");
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE);
-  gtk_container_add (GTK_CONTAINER (win), box);
+  gtk_window_set_child (GTK_WINDOW (win), box);
   controller = annoying_event_controller_motion_new ();
   g_signal_connect (controller, "enter", G_CALLBACK (enter1_cb), NULL);
   g_signal_connect (controller, "leave", G_CALLBACK (leave1_cb), NULL);
@@ -153,7 +153,7 @@ test2 (void)
   gtk_window_set_title (GTK_WINDOW (win), "show/hide");
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE);
-  gtk_container_add (GTK_CONTAINER (win), box);
+  gtk_window_set_child (GTK_WINDOW (win), box);
   controller = annoying_event_controller_motion_new ();
   g_signal_connect (controller, "enter", G_CALLBACK (enter2_cb), NULL);
   g_signal_connect (controller, "leave", G_CALLBACK (leave2_cb), NULL);
@@ -197,7 +197,7 @@ test3 (void)
   gtk_window_set_title (GTK_WINDOW (win), "child-visible");
 
   stack = gtk_stack_new ();
-  gtk_container_add (GTK_CONTAINER (win), stack);
+  gtk_window_set_child (GTK_WINDOW (win), stack);
   controller = annoying_event_controller_motion_new ();
   g_signal_connect (controller, "enter", G_CALLBACK (enter3_cb), NULL);
   g_signal_connect (controller, "leave", G_CALLBACK (leave3_cb), NULL);
@@ -243,7 +243,7 @@ test4 (void)
   gtk_window_set_title (GTK_WINDOW (win), "move");
 
   fixed = gtk_fixed_new ();
-  gtk_container_add (GTK_CONTAINER (win), fixed);
+  gtk_window_set_child (GTK_WINDOW (win), fixed);
   controller = annoying_event_controller_motion_new ();
   g_signal_connect (controller, "enter", G_CALLBACK (enter4_cb), NULL);
   g_signal_connect (controller, "leave", G_CALLBACK (leave4_cb), NULL);

diff --git a/tests/testicontheme.c b/tests/testicontheme.c
index 03495125bb21499d2b7af85b860c0f82bc0dd095..ae88684b97326b60f2c4feda2a87022e5cefa918 100644 (file)
--- a/tests/testicontheme.c
+++ b/tests/testicontheme.c
@@ -106,7 +106,7 @@ main (int argc, char *argv[])
       image = gtk_image_new ();
       gtk_image_set_from_paintable (GTK_IMAGE (image), GDK_PAINTABLE (icon));
       g_object_unref (icon);
-      gtk_container_add (GTK_CONTAINER (window), image);
+      gtk_window_set_child (GTK_WINDOW (window), image);
       g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
       gtk_widget_show (window);
 

diff --git a/tests/testiconview-keynav.c b/tests/testiconview-keynav.c
index 50277502d2017a5a60933dca9fae0a99401677b7..5c4dcdbac5037f83ab1ce6271e81ff202fc5e563 100644 (file)
--- a/tests/testiconview-keynav.c
+++ b/tests/testiconview-keynav.c
@@ -234,7 +234,7 @@ main (int argc, char *argv[])
 
   window = gtk_window_new ();
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_container_add (GTK_CONTAINER (window), vbox);
+  gtk_window_set_child (GTK_WINDOW (window), vbox);
 
   views.header1 = g_object_new (GTK_TYPE_LABEL,
                                 "label", "<b>Group 1</b>",

diff --git a/tests/testiconview.c b/tests/testiconview.c
index cd40c6e63bbb242603365ca79f1b16324a9decc6..102eed4d33fc171db3f3827d5a67c58076ae5737 100644 (file)
--- a/tests/testiconview.c
+++ b/tests/testiconview.c
@@ -417,7 +417,7 @@ main (gint argc, gchar **argv)
   gtk_window_set_default_size (GTK_WINDOW (window), 700, 400);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_container_add (GTK_CONTAINER (window), vbox);
+  gtk_window_set_child (GTK_WINDOW (window), vbox);
 
   paned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_widget_set_vexpand (paned, TRUE);

diff --git a/tests/testinfobar.c b/tests/testinfobar.c
index 874db9cc52055535c8a5c70dd4b98876c7ef1691..9145aba9c261dd51bd43839d721397093386f7e6 100644 (file)
--- a/tests/testinfobar.c
+++ b/tests/testinfobar.c
@@ -86,7 +86,7 @@ on_activate (GApplication *application,
                     G_CALLBACK (on_info_bar_response), widget);
 
   widget = gtk_window_new ();
-  gtk_container_add (GTK_CONTAINER (widget), box);
+  gtk_window_set_child (GTK_WINDOW (widget), box);
   gtk_widget_show (widget);
   gtk_application_add_window (GTK_APPLICATION (application),
                               GTK_WINDOW (widget));

diff --git a/tests/testinhibitshortcuts.c b/tests/testinhibitshortcuts.c
index 6de7a89cfe1d0a81fdc8a451225290184ef36d10..abdf232569b8829a725eb193dfc6d877ef1e9f10 100644 (file)
--- a/tests/testinhibitshortcuts.c
+++ b/tests/testinhibitshortcuts.c
@@ -80,7 +80,7 @@ main (int argc, char *argv[])
   surface = gtk_native_get_surface (gtk_widget_get_native (window));
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
-  gtk_container_add (GTK_CONTAINER (window), vbox);
+  gtk_window_set_child (GTK_WINDOW (window), vbox);
 
   text_view = gtk_text_view_new ();
   gtk_widget_set_hexpand (text_view, TRUE);

diff --git a/tests/testkineticscrolling.c b/tests/testkineticscrolling.c
index 90944de2f9b013cbff632d9c16d6a74fe949c890..e5355e3aa94a17c649d42a476245032038f00081 100644 (file)
--- a/tests/testkineticscrolling.c
+++ b/tests/testkineticscrolling.c
@@ -131,7 +131,7 @@ kinetic_scrolling (void)
   gtk_widget_set_vexpand (swindow, TRUE);
   gtk_widget_show (swindow);
 
-  gtk_container_add (GTK_CONTAINER (window), grid);
+  gtk_window_set_child (GTK_WINDOW (window), grid);
   gtk_widget_show (grid);
 
   gtk_widget_show (window);

diff --git a/tests/testlevelbar.c b/tests/testlevelbar.c
index 0d9cb34d44e73aed02690f3c6b7af1196d29b373..e9fd02df91c7d63ac15db000303b9b2f348015b8 100644 (file)
--- a/tests/testlevelbar.c
+++ b/tests/testlevelbar.c
@@ -97,7 +97,7 @@ main (int argc, char *argv[])
   gtk_widget_set_margin_top (box, 20);
   gtk_widget_set_margin_bottom (box, 20);
   bar = create_level_bar ();
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
   gtk_container_add (GTK_CONTAINER (box), bar);
   box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
   gtk_container_add (GTK_CONTAINER (box), box2);

diff --git a/tests/testlist.c b/tests/testlist.c
index 14a6ceb3f8682c1d510df7a28211b1bf62fd0785..d0ff42a902e126600e4c9de8f82bccb8a1bb8a90 100644 (file)
--- a/tests/testlist.c
+++ b/tests/testlist.c
@@ -259,7 +259,7 @@ main (int argc, char *argv[])
 
   window = gtk_window_new ();
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_container_add (GTK_CONTAINER (window), hbox);
+  gtk_window_set_child (GTK_WINDOW (window), hbox);
 
   provider = gtk_css_provider_new ();
   gtk_css_provider_load_from_data (provider, css, -1);

diff --git a/tests/testlist2.c b/tests/testlist2.c
index 3dfb4702c29f5983779fa9f88a7771ccfc07c5a6..1aa933d3c28f0f0219f8716f0eddf4b303c93190 100644 (file)
--- a/tests/testlist2.c
+++ b/tests/testlist2.c
@@ -122,7 +122,7 @@ int main (int argc, char *argv[])
   gtk_list_box_set_selection_mode (GTK_LIST_BOX (list), GTK_SELECTION_NONE);
   gtk_list_box_set_header_func (GTK_LIST_BOX (list), add_separator, NULL, NULL);
   sw = gtk_scrolled_window_new (NULL, NULL);
-  gtk_container_add (GTK_CONTAINER (window), sw);
+  gtk_window_set_child (GTK_WINDOW (window), sw);
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), list);
 
   for (i = 0; i < 20; i++)

diff --git a/tests/testlist3.c b/tests/testlist3.c
index 00444ab7772b54ee4c02a65a9350fd010b801060..bc2f61e83fcd7074aaad1d71f0b346fc9d580452 100644 (file)
--- a/tests/testlist3.c
+++ b/tests/testlist3.c
@@ -139,7 +139,7 @@ main (int argc, char *argv[])
   gtk_window_set_default_size (GTK_WINDOW (window), -1, 300);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-  gtk_container_add (GTK_CONTAINER (window), hbox);
+  gtk_window_set_child (GTK_WINDOW (window), hbox);
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_widget_set_margin_start (vbox, 12);
   gtk_widget_set_margin_end (vbox, 12);

diff --git a/tests/testlist4.c b/tests/testlist4.c
index 8f4294e2f5f0d07493800787537a652dcc5e3205..d820d58b523c48c7e008cade4fd905d7f239ac80 100644 (file)
--- a/tests/testlist4.c
+++ b/tests/testlist4.c
@@ -101,7 +101,7 @@ new_window (GApplication *app)
 
   /* widget creation */
   grid = gtk_grid_new ();
-  gtk_container_add (GTK_CONTAINER (window), grid);
+  gtk_window_set_child (GTK_WINDOW (window), grid);
   sw = gtk_scrolled_window_new (NULL, NULL);
   gtk_widget_set_hexpand (GTK_WIDGET (sw), true);
   gtk_widget_set_vexpand (GTK_WIDGET (sw), true);

diff --git a/tests/testlockbutton.c b/tests/testlockbutton.c
index e6622b448606ea476392fc518776efdbaf1aae06..da37f6c8976d33b67081953bbb6707533d8ced9d 100644 (file)
--- a/tests/testlockbutton.c
+++ b/tests/testlockbutton.c
@@ -227,7 +227,7 @@ main (int argc, char *argv[])
   gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
 
   allowed_button = gtk_check_button_new_with_label ("Allowed");
   gtk_container_add (GTK_CONTAINER (box), allowed_button);

diff --git a/tests/testlogout.c b/tests/testlogout.c
index e028c0d0fd2bd69a2505d5b5b44f610e145f69bd..2d9cd215bd4fec2e6f04547f6744bace26284dd6 100644 (file)
--- a/tests/testlogout.c
+++ b/tests/testlogout.c
@@ -86,7 +86,7 @@ activate (GtkApplication *app,
   gtk_widget_set_margin_end (box, 12);
   gtk_widget_set_margin_top (box, 12);
   gtk_widget_set_margin_bottom (box, 12);
-  gtk_container_add (GTK_CONTAINER (win), box);
+  gtk_window_set_child (GTK_WINDOW (win), box);
 
   grid = gtk_grid_new ();
   gtk_grid_set_row_spacing (GTK_GRID (grid), 6);

diff --git a/tests/testmenubutton.c b/tests/testmenubutton.c
index cb2b647b0f3d081261bc48fb53f268b7e19be6ac..7ef5eaa4b090ab4038f94f8632f47a307a279084 100644 (file)
--- a/tests/testmenubutton.c
+++ b/tests/testmenubutton.c
@@ -52,7 +52,7 @@ int main (int argc, char **argv)
        grid = gtk_grid_new ();
        gtk_grid_set_row_spacing (GTK_GRID (grid), 12);
        gtk_grid_set_column_spacing (GTK_GRID (grid), 12);
-       gtk_container_add (GTK_CONTAINER (window), grid);
+       gtk_window_set_child (GTK_WINDOW (window), grid);
 
        /* horizontal alignment */
        label = gtk_label_new ("Horizontal Alignment:");

diff --git a/tests/testnoscreen.c b/tests/testnoscreen.c
index e213277a3e1ca64a7aae873d2a2d4d05d4a1b24e..72b0c8daaf46e4b9682607e6aac30f3560e8dd55 100644 (file)
--- a/tests/testnoscreen.c
+++ b/tests/testnoscreen.c
@@ -35,7 +35,7 @@ int main (int argc, char *argv[])
 
   window = gtk_window_new ();
   button = gtk_button_new ();
-  gtk_container_add (GTK_CONTAINER (window), button);
+  gtk_window_set_child (GTK_WINDOW (window), button);
 
   display = gdk_display_open (NULL);
 

diff --git a/tests/testnotebookdnd.c b/tests/testnotebookdnd.c
index a93c6d4dcbfeb27cc154d99706c96bf7567505f5..b55028299b1751618a62eb074503bddf6449bdaf 100644 (file)
--- a/tests/testnotebookdnd.c
+++ b/tests/testnotebookdnd.c
@@ -72,7 +72,7 @@ window_creation_function (GtkNotebook *source_notebook,
   gtk_notebook_set_group_name (GTK_NOTEBOOK (notebook),
                                gtk_notebook_get_group_name (source_notebook));
 
-  gtk_container_add (GTK_CONTAINER (window), notebook);
+  gtk_window_set_child (GTK_WINDOW (window), notebook);
 
   gtk_window_set_default_size (GTK_WINDOW (window), 300, 300);
   gtk_widget_show (window);
@@ -317,7 +317,7 @@ main (gint argc, gchar *argv[])
                    create_trash_button (),
                    1, 2, 1, 1);
 
-  gtk_container_add (GTK_CONTAINER (window), grid);
+  gtk_window_set_child (GTK_WINDOW (window), grid);
   gtk_window_set_default_size (GTK_WINDOW (window), 400, 400);
 
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);

diff --git a/tests/testorientable.c b/tests/testorientable.c
index f0f98627e686d86e6e8b468dd946a30d030605a5..0ffa5b184c001947540e2e95070aa592c6418975 100644 (file)
--- a/tests/testorientable.c
+++ b/tests/testorientable.c
@@ -91,7 +91,7 @@ main (int argc, char **argv)
   g_signal_connect (button, "toggled",
                   G_CALLBACK (orient_toggled), orientables);
 
-  gtk_container_add (GTK_CONTAINER (window), grid);
+  gtk_window_set_child (GTK_WINDOW (window), grid);
   gtk_widget_show (window);
 
   g_signal_connect (window, "destroy",

diff --git a/tests/testoutsetshadowdrawing.c b/tests/testoutsetshadowdrawing.c
index 0966f42ddf5e3d8ebc37fd924c1ab3e452003117..49ee0d12f952a0f9eff24053fa9a61f2500b4417 100644 (file)
--- a/tests/testoutsetshadowdrawing.c
+++ b/tests/testoutsetshadowdrawing.c
@@ -162,7 +162,7 @@ main (int argc, char **argv)
 
   gtk_container_add (GTK_CONTAINER (box), top);
   gtk_container_add (GTK_CONTAINER (box), bottom);
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
   gtk_widget_show (window);
 

diff --git a/tests/testoverlay.c b/tests/testoverlay.c
index 54b92789f0cb6502d8a0f303e70f7e6f2e41c5ae..210fe7594bb11c8112da51e23bea842c851d2449 100644 (file)
--- a/tests/testoverlay.c
+++ b/tests/testoverlay.c
@@ -50,7 +50,7 @@ test_nonzerox (void)
   gtk_widget_set_margin_top (grid, 5);
   gtk_widget_set_margin_bottom (grid, 5);
 
-  gtk_container_add (GTK_CONTAINER (win), grid);
+  gtk_window_set_child (GTK_WINDOW (win), grid);
   gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Above"), 1, 0, 1, 1);
   gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Below"), 1, 2, 1, 1);
   gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Left"), 0, 1, 1, 1);
@@ -135,7 +135,7 @@ test_relative (void)
   gtk_window_set_title (GTK_WINDOW (win), "Custom positioning");
 
   overlay = gtk_overlay_new ();
-  gtk_container_add (GTK_CONTAINER (win), overlay);
+  gtk_window_set_child (GTK_WINDOW (win), overlay);
 
   grid = gtk_grid_new ();
   gtk_container_add (GTK_CONTAINER (overlay), grid);
@@ -190,7 +190,7 @@ test_fullwidth (void)
   gtk_window_set_title (GTK_WINDOW (win), "Full-width");
 
   overlay = gtk_overlay_new ();
-  gtk_container_add (GTK_CONTAINER (win), overlay);
+  gtk_window_set_child (GTK_WINDOW (win), overlay);
 
   text = gtk_text_view_new ();
   gtk_widget_set_size_request (text, 200, 200);
@@ -227,7 +227,7 @@ test_scrolling (void)
   gtk_window_set_title (GTK_WINDOW (win), "Scrolling");
 
   overlay = gtk_overlay_new ();
-  gtk_container_add (GTK_CONTAINER (win), overlay);
+  gtk_window_set_child (GTK_WINDOW (win), overlay);
 
   sw = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_min_content_width (GTK_SCROLLED_WINDOW (sw), 200);
@@ -373,7 +373,7 @@ test_chase (void)
   gtk_window_set_title (GTK_WINDOW (win), "Chase");
 
   overlay = gtk_overlay_new ();
-  gtk_container_add (GTK_CONTAINER (win), overlay);
+  gtk_window_set_child (GTK_WINDOW (win), overlay);
 
   sw = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_min_content_width (GTK_SCROLLED_WINDOW (sw), 200);
@@ -446,7 +446,7 @@ test_stacking (void)
   gtk_container_add (GTK_CONTAINER (overlay), main_child);
   gtk_overlay_add_overlay (GTK_OVERLAY (overlay), child);
   gtk_grid_attach (GTK_GRID (grid), overlay, 1, 0, 1, 3);
-  gtk_container_add (GTK_CONTAINER (win), grid);
+  gtk_window_set_child (GTK_WINDOW (win), grid);
 
   gtk_grid_attach (GTK_GRID (grid), check1, 0, 0, 1, 1);
   gtk_grid_attach (GTK_GRID (grid), check2, 0, 1, 1, 1);
@@ -505,7 +505,7 @@ test_input_stacking (void)
   gtk_container_add (GTK_CONTAINER (vbox), entry);
 
 
-  gtk_container_add (GTK_CONTAINER (win), overlay);
+  gtk_window_set_child (GTK_WINDOW (win), overlay);
 
   return win;
 }

diff --git a/tests/testoverlaystyleclass.c b/tests/testoverlaystyleclass.c
index 4243e1e7e922445a2265be0d84db9f3f82d06c55..5cff97abb64d25743e5d20ec3a3a79ede450b398 100644 (file)
--- a/tests/testoverlaystyleclass.c
+++ b/tests/testoverlaystyleclass.c
@@ -150,7 +150,7 @@ main (int argc, char *argv[])
                     G_CALLBACK (overlay_get_child_position), child);
 
   gtk_grid_attach (GTK_GRID (grid), overlay, 1, 0, 1, 3);
-  gtk_container_add (GTK_CONTAINER (win), grid);
+  gtk_window_set_child (GTK_WINDOW (win), grid);
 
   g_print ("\n");
 

diff --git a/tests/testpixbuf-scale.c b/tests/testpixbuf-scale.c
index 8d4ec92fc57bdf87136fc2f738452db186e662c2..eef877a2c1da00475bbc7feb322c735272befae8 100644 (file)
--- a/tests/testpixbuf-scale.c
+++ b/tests/testpixbuf-scale.c
@@ -104,7 +104,7 @@ main(int argc, char **argv)
                          G_CALLBACK (quit_cb), &done);
        
        vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-       gtk_container_add (GTK_CONTAINER (window), vbox);
+       gtk_window_set_child (GTK_WINDOW (window), vbox);
 
         combo_box = gtk_combo_box_text_new ();
 

diff --git a/tests/testplacesview.c b/tests/testplacesview.c
index 84974ee36ee8d38b179cfb4259386f4ce9740eff..50e00e99cca0fe757798f1662cd7597fd7d37250 100644 (file)
--- a/tests/testplacesview.c
+++ b/tests/testplacesview.c
@@ -27,7 +27,7 @@ main (int argc, char *argv[])
 
   view = gtk_places_view_new ();
 
-  gtk_container_add (GTK_CONTAINER (win), view);
+  gtk_window_set_child (GTK_WINDOW (win), view);
   gtk_widget_show (win);
 
   g_signal_connect (win, "destroy", G_CALLBACK (quit_cb), &done);

diff --git a/tests/testpopover.c b/tests/testpopover.c
index a18c5f4459ff1b385f35e0df29e54da95e9ffb31..5d3b0fff05e2c4c0cbcbee7246e29aeaffc57857 100644 (file)
--- a/tests/testpopover.c
+++ b/tests/testpopover.c
@@ -82,7 +82,7 @@ main (int argc, char *argv[])
   gtk_widget_insert_action_group (win, "top", G_ACTION_GROUP (actions));
 
   overlay = gtk_overlay_new ();
-  gtk_container_add (GTK_CONTAINER (win), overlay);
+  gtk_window_set_child (GTK_WINDOW (win), overlay);
 
   grid = gtk_grid_new ();
   gtk_widget_set_halign (grid, GTK_ALIGN_FILL);

diff --git a/tests/testrevealer.c b/tests/testrevealer.c
index 81e4d8bd2f9605be72f0122ed1c3e600afe5d531..575d6aa15bf56afd9d44253c955ab24fd3e5e027 100644 (file)
--- a/tests/testrevealer.c
+++ b/tests/testrevealer.c
@@ -12,7 +12,7 @@ main (gint argc,
   gtk_widget_set_size_request (window, 300, 300);
 
   box = gtk_grid_new ();
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
 
   widget = gtk_label_new ("Some filler text to avoid\nresizing of the window");
   gtk_widget_set_margin_top (widget, 10);

diff --git a/tests/testrevealer2.c b/tests/testrevealer2.c
index dfdb1d9fc3db15cc2a8c83cb2e64f693c8d1e046..e44bf22a17fe74661dffa6fff28d721d30ab6857 100644 (file)
--- a/tests/testrevealer2.c
+++ b/tests/testrevealer2.c
@@ -34,7 +34,7 @@ on_activate (GApplication *app,
 
       /* content */
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_container_add (GTK_CONTAINER (window), hbox);
+      gtk_window_set_child (GTK_WINDOW (window), hbox);
 
       revealer = gtk_revealer_new ();
       gtk_revealer_set_transition_type (GTK_REVEALER (revealer),

diff --git a/tests/testscale.c b/tests/testscale.c
index 735ac6474cf439c63842a94a2de43a0f08a35b08..797f77d8da45f173ba5e28943a1f564e800aaa68 100644 (file)
--- a/tests/testscale.c
+++ b/tests/testscale.c
@@ -136,7 +136,7 @@ int main (int argc, char *argv[])
   gtk_widget_set_hexpand (flipbox, TRUE);
   gtk_widget_set_vexpand (flipbox, TRUE);
   gtk_container_add (GTK_CONTAINER (box1), box);
-  gtk_container_add (GTK_CONTAINER (window), box1);
+  gtk_window_set_child (GTK_WINDOW (window), box1);
 
   frame = gtk_frame_new ("No marks");
   scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 100, 1);

diff --git a/tests/testscrolledge.c b/tests/testscrolledge.c
index af674571d888018815c7350aecb9485a648785e0..b6b393167f8be244233f818e017e1d94ba9a22ff 100644 (file)
--- a/tests/testscrolledge.c
+++ b/tests/testscrolledge.c
@@ -125,7 +125,7 @@ main (int argc, char *argv[])
   list = gtk_list_box_new ();
   gtk_list_box_set_selection_mode (GTK_LIST_BOX (list), GTK_SELECTION_NONE);
 
-  gtk_container_add (GTK_CONTAINER (win), overlay);
+  gtk_window_set_child (GTK_WINDOW (win), overlay);
   gtk_container_add (GTK_CONTAINER (overlay), sw);
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), list);
   populate_list (GTK_LIST_BOX (list));

diff --git a/tests/testscrolledwindow.c b/tests/testscrolledwindow.c
index 7c181227cfd6fdfa38bb50df39e88ef96ddca584..6ea0fa354e1ef42cad45f03fea29c1f078e3fb0a 100644 (file)
--- a/tests/testscrolledwindow.c
+++ b/tests/testscrolledwindow.c
@@ -89,7 +89,7 @@ scrollable_policy (void)
 
   gtk_widget_show (vbox);
   gtk_widget_show (hbox);
-  gtk_container_add (GTK_CONTAINER (window), hbox);
+  gtk_window_set_child (GTK_WINDOW (window), hbox);
   gtk_container_add (GTK_CONTAINER (hbox), vbox);
 
   frame = gtk_frame_new ("Scrolled Window");

diff --git a/tests/testscrolltofocus.c b/tests/testscrolltofocus.c
index 58c508344277eb375e3b8301417fbb5c95656be2..e524988a3d0bd53eab262f9ed3a074b94475a737 100644 (file)
--- a/tests/testscrolltofocus.c
+++ b/tests/testscrolltofocus.c
@@ -11,7 +11,7 @@ int main (int argc, char *argv[])
 
   window = gtk_window_new ();
   sw = gtk_scrolled_window_new (NULL, NULL);
-  gtk_container_add (GTK_CONTAINER (window), sw);
+  gtk_window_set_child (GTK_WINDOW (window), sw);
   viewport = gtk_viewport_new (gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (sw)),
                                gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (sw)));
   gtk_viewport_set_scroll_to_focus (GTK_VIEWPORT (viewport), TRUE);

diff --git a/tests/testsensitive.c b/tests/testsensitive.c
index a7badb9aafd909ec9c5a92bb9f9ccf419c270916..7f8b0be77e67b662e6d79a69fe1dd748b2f807d2 100644 (file)
--- a/tests/testsensitive.c
+++ b/tests/testsensitive.c
@@ -62,7 +62,7 @@ int main (int argc, char *argv[])
 
   window = gtk_window_new ();
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
 
   w = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 15);
   gtk_container_add (GTK_CONTAINER (box), w);

diff --git a/tests/testsounds.c b/tests/testsounds.c
index 169120eb71b958573752d596530a884ed23a2617..3a62f69fae5b5f92b5b2eca5bcf3fcb97f87ae31 100644 (file)
--- a/tests/testsounds.c
+++ b/tests/testsounds.c
@@ -49,7 +49,7 @@ int main (int argc, char *argv[])
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
   gtk_widget_set_halign (box, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (box, GTK_ALIGN_CENTER);
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
 
   button = gtk_button_new_with_label ("Α");
   g_signal_connect (button, "clicked", G_CALLBACK (enter), NULL);

diff --git a/tests/testspinbutton.c b/tests/testspinbutton.c
index 9ba8d23148c9a9dabf40c99169513fc1b7863929..ca1ff40b67eac969ca4eb7ef4e5e8fb16dff8a85 100644 (file)
--- a/tests/testspinbutton.c
+++ b/tests/testspinbutton.c
@@ -45,7 +45,7 @@ prepare_window_for_orientation (GtkOrientation orientation)
   g_signal_connect (window, "close-request", G_CALLBACK (on_delete), NULL);
 
   mainbox = gtk_box_new (GTK_ORIENTATION_VERTICAL ^ orientation, 2);
-  gtk_container_add (GTK_CONTAINER (window), mainbox);
+  gtk_window_set_child (GTK_WINDOW (window), mainbox);
 
   wrap_button = gtk_toggle_button_new_with_label ("Wrap");
   gtk_container_add (GTK_CONTAINER (mainbox), wrap_button);

diff --git a/tests/teststack.c b/tests/teststack.c
index 079a7ff104b81de7a6395394bb85d144b08bd261..00b21226a4d4e0b4d63a319888b342be64cab8bd 100644 (file)
--- a/tests/teststack.c
+++ b/tests/teststack.c
@@ -126,7 +126,7 @@ main (gint argc,
   gtk_widget_set_size_request (window, 300, 300);
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
 
   switcher = gtk_stack_switcher_new ();
   gtk_container_add (GTK_CONTAINER (box), switcher);

diff --git a/tests/testswitch.c b/tests/testswitch.c
index ec6bab461962e6d34f9ee7b70cb520bf20f033cf..0a3644ab6b0f5d44d306a20fd5b3b42263d7848d 100644 (file)
--- a/tests/testswitch.c
+++ b/tests/testswitch.c
@@ -173,7 +173,7 @@ int main (int argc, char *argv[])
   gtk_widget_show (window);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-  gtk_container_add (GTK_CONTAINER (window), vbox);
+  gtk_window_set_child (GTK_WINDOW (window), vbox);
 
   hbox = make_switch (FALSE, TRUE);
   gtk_container_add (GTK_CONTAINER (vbox), hbox);

diff --git a/tests/testtexture.c b/tests/testtexture.c
index dff9626fd041ad1c17a0b0f79be73c88e6db4093..78c546494949fdfcda43d450eb467ee276b9f45b 100644 (file)
--- a/tests/testtexture.c
+++ b/tests/testtexture.c
@@ -143,7 +143,7 @@ main (int argc, char **argv)
   view = g_object_new (GTK_TYPE_TEXTURE_VIEW, NULL);
   ((GtkTextureView*)view)->texture = g_steal_pointer (&texture);
 
-  gtk_container_add (GTK_CONTAINER (window), view);
+  gtk_window_set_child (GTK_WINDOW (window), view);
 
   gtk_widget_show (window);
 

diff --git a/tests/testtextview.c b/tests/testtextview.c
index c5918355b44e8235225989dc9bfaaff1413c2baa..a8aa9da1011ca4379d02afef71cc3014af95e50b 100644 (file)
--- a/tests/testtextview.c
+++ b/tests/testtextview.c
@@ -192,7 +192,7 @@ main (int argc, char **argv)
   create_tags (buffer);
   anchor = insert_text (buffer);
 
-  gtk_container_add (GTK_CONTAINER (window), sw);
+  gtk_window_set_child (GTK_WINDOW (window), sw);
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), textview);
   gtk_text_view_add_overlay (GTK_TEXT_VIEW (textview),
                              button,

diff --git a/tests/testtextview2.c b/tests/testtextview2.c
index 42a7e08f42bbbbf28ce923533bb536088640fd7c..b7a2af89c323aabe56e272abe8b396291af07651 100644 (file)
--- a/tests/testtextview2.c
+++ b/tests/testtextview2.c
@@ -199,7 +199,7 @@ main (int argc, char *argv[])
   sw = gtk_scrolled_window_new (NULL, NULL);
   gtk_widget_set_hexpand (sw, TRUE);
   gtk_widget_set_vexpand (sw, TRUE);
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
   gtk_container_add (GTK_CONTAINER (box), sw);
 
   tv = gtk_text_view_new ();

diff --git a/tests/testtoolbar2.c b/tests/testtoolbar2.c
index 82f8918e3d96cd5d03a8fac2a3e83c4eb2905173..50698713d889e7281c78171e46f8db5e33359146 100644 (file)
--- a/tests/testtoolbar2.c
+++ b/tests/testtoolbar2.c
@@ -14,7 +14,7 @@ int main (int argc, char *argv[])
   window = gtk_window_new ();
   gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
   frame = gtk_frame_new (NULL);
   gtk_container_add (GTK_CONTAINER (box), frame);
   view = gtk_text_view_new ();

diff --git a/tests/testtooltips.c b/tests/testtooltips.c
index 8696427e2fd788b6bfe9c832b1f694df696b2d34..88bd6473c696e01e24465667c1da74eb2750d8fa 100644 (file)
--- a/tests/testtooltips.c
+++ b/tests/testtooltips.c
@@ -302,7 +302,7 @@ main (int argc, char *argv[])
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
 
   tooltip = g_object_new (my_tooltip_get_type (), NULL);
   gtk_widget_set_margin_top (tooltip, 20);

diff --git a/tests/testtreechanging.c b/tests/testtreechanging.c
index 9cfb81ef7427af0730178c8f0280e451d407de7f..dab647c6fcb027b1a1e6ba5df3527a87b8be8c8a 100644 (file)
--- a/tests/testtreechanging.c
+++ b/tests/testtreechanging.c
@@ -501,7 +501,7 @@ main (int    argc,
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                   GTK_POLICY_AUTOMATIC,
                                   GTK_POLICY_AUTOMATIC);
-  gtk_container_add (GTK_CONTAINER (window), sw);
+  gtk_window_set_child (GTK_WINDOW (window), sw);
 
   model = GTK_TREE_MODEL (gtk_tree_store_new (1, G_TYPE_UINT));
   treeview = gtk_tree_view_new_with_model (model);

diff --git a/tests/testtreecolumns.c b/tests/testtreecolumns.c
index 07002cc8b3e7a2c8d53ca9238efd32c58a0cd481..f7bafa571b746cb29b4c1c15e6a9ee0fa8125ade 100644 (file)
--- a/tests/testtreecolumns.c
+++ b/tests/testtreecolumns.c
@@ -762,7 +762,7 @@ main (int argc, char *argv[])
   gtk_window_set_default_size (GTK_WINDOW (window), 300, 300);
   gtk_window_set_title (GTK_WINDOW (window), "Top Window");
   swindow = gtk_scrolled_window_new (NULL, NULL);
-  gtk_container_add (GTK_CONTAINER (window), swindow);
+  gtk_window_set_child (GTK_WINDOW (window), swindow);
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), sample_tree_view_top);
   gtk_widget_show (window);
 
@@ -771,7 +771,7 @@ main (int argc, char *argv[])
   gtk_window_set_default_size (GTK_WINDOW (window), 300, 300);
   gtk_window_set_title (GTK_WINDOW (window), "Bottom Window");
   swindow = gtk_scrolled_window_new (NULL, NULL);
-  gtk_container_add (GTK_CONTAINER (window), swindow);
+  gtk_window_set_child (GTK_WINDOW (window), swindow);
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), sample_tree_view_bottom);
   gtk_widget_show (window);
 
@@ -780,7 +780,7 @@ main (int argc, char *argv[])
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
   gtk_window_set_default_size (GTK_WINDOW (window), 500, 300);
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-  gtk_container_add (GTK_CONTAINER (window), vbox);
+  gtk_window_set_child (GTK_WINDOW (window), vbox);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
   gtk_container_add (GTK_CONTAINER (vbox), hbox);

diff --git a/tests/testtreecolumnsizing.c b/tests/testtreecolumnsizing.c
index 39ef865a77995b069166aeb19edf6d0d4c61c45a..a9709aae473952ba4b8f8e229a6295342c3727ca 100644 (file)
--- a/tests/testtreecolumnsizing.c
+++ b/tests/testtreecolumnsizing.c
@@ -190,7 +190,7 @@ main (int argc, char **argv)
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-  gtk_container_add (GTK_CONTAINER (window), vbox);
+  gtk_window_set_child (GTK_WINDOW (window), vbox);
 
   /* Option menu contents */
   combo_box = gtk_combo_box_text_new ();

diff --git a/tests/testtreednd.c b/tests/testtreednd.c
index 3bf664dd708ced9bb0ba50865de638df93aafd1d..76483dd6b4bbe93956626416b3bb19a968ba67e3 100644 (file)
--- a/tests/testtreednd.c
+++ b/tests/testtreednd.c
@@ -122,7 +122,7 @@ main (int argc, char *argv[])
   window = gtk_window_new ();
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
   gtk_container_add (GTK_CONTAINER (box), get_dragsource ());
   gtk_container_add (GTK_CONTAINER (box), get_droptarget ());
 

diff --git a/tests/testtreeedit.c b/tests/testtreeedit.c
index a1d4b3e59cc862b1c726e4aeaece563933406e47..fb8b4825deeffdf8c9331dd90fb287c63e6a6f82 100644 (file)
--- a/tests/testtreeedit.c
+++ b/tests/testtreeedit.c
@@ -252,7 +252,7 @@ main (gint argc, gchar **argv)
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-  gtk_container_add (GTK_CONTAINER (window), vbox);
+  gtk_window_set_child (GTK_WINDOW (window), vbox);
 
   scrolled_window = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled_window), TRUE);

diff --git a/tests/testtreeflow.c b/tests/testtreeflow.c
index c39687c458238e6027f0104cc040b1f4e3314039..10a5894d7498e723eb3e8c6ac6eb64b13d02dc05 100644 (file)
--- a/tests/testtreeflow.c
+++ b/tests/testtreeflow.c
@@ -149,7 +149,7 @@ main (int argc, char *argv[])
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
   gtk_container_add (GTK_CONTAINER (vbox), gtk_label_new ("Incremental Reflow Test"));
-  gtk_container_add (GTK_CONTAINER (window), vbox);
+  gtk_window_set_child (GTK_WINDOW (window), vbox);
   scrolled_window = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
                                  GTK_POLICY_AUTOMATIC,

diff --git a/tests/testtreefocus.c b/tests/testtreefocus.c
index a89fd74015b1c6c0995d1b33a29fe351ae6e4816..4c4928b9b3a6d9c2ea91d9815bd35c8d050af36f 100644 (file)
--- a/tests/testtreefocus.c
+++ b/tests/testtreefocus.c
@@ -365,7 +365,7 @@ main (int argc, char *argv[])
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
   gtk_container_add (GTK_CONTAINER (vbox), gtk_label_new ("Jonathan's Holiday Card Planning Sheet"));
-  gtk_container_add (GTK_CONTAINER (window), vbox);
+  gtk_window_set_child (GTK_WINDOW (window), vbox);
 
   scrolled_window = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled_window), TRUE);
@@ -480,7 +480,7 @@ main (int argc, char *argv[])
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
   gtk_container_add (GTK_CONTAINER (vbox), gtk_label_new ("The model revealed"));
-  gtk_container_add (GTK_CONTAINER (window), vbox);
+  gtk_window_set_child (GTK_WINDOW (window), vbox);
 
   scrolled_window = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled_window), TRUE);

diff --git a/tests/testtreelistmodel.c b/tests/testtreelistmodel.c
index 06d956a139bac2fa276156ef12eb3137a906396d..b267fded4cbf008e61b05b06f510fc3e4b922bfb 100644 (file)
--- a/tests/testtreelistmodel.c
+++ b/tests/testtreelistmodel.c
@@ -327,7 +327,7 @@ main (int argc, char *argv[])
   g_signal_connect (win, "destroy", G_CALLBACK (quit_cb), &done);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_container_add (GTK_CONTAINER (win), vbox);
+  gtk_window_set_child (GTK_WINDOW (win), vbox);
 
   search_entry = gtk_search_entry_new ();
   gtk_container_add (GTK_CONTAINER (vbox), search_entry);

diff --git a/tests/testtreepos.c b/tests/testtreepos.c
index 5625d2631e185f39453612e923eadf4304d52acf..c00aa96b88444ca4727950455e78495fc90a1a5f 100644 (file)
--- a/tests/testtreepos.c
+++ b/tests/testtreepos.c
@@ -95,7 +95,7 @@ int main (int argc, char *argv[])
 
   window = gtk_window_new ();
   sw = gtk_scrolled_window_new (NULL, NULL);
-  gtk_container_add (GTK_CONTAINER (window), sw);
+  gtk_window_set_child (GTK_WINDOW (window), sw);
   tv = gtk_tree_view_new ();
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), tv);
 

diff --git a/tests/testtreesort.c b/tests/testtreesort.c
index 4cf69048978564a298604a54c9684e390f5cea8b..dbb6ad52df1a79294abb532e48bfc208f0f6c47a 100644 (file)
--- a/tests/testtreesort.c
+++ b/tests/testtreesort.c
@@ -123,7 +123,7 @@ main (int argc, char *argv[])
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
   gtk_container_add (GTK_CONTAINER (vbox), gtk_label_new ("Jonathan and Kristian's list of cool words. (And Anders' cool list of numbers) \n\nThis is just a GtkTreeStore"));
-  gtk_container_add (GTK_CONTAINER (window), vbox);
+  gtk_window_set_child (GTK_WINDOW (window), vbox);
 
   entry = gtk_entry_new ();
   gtk_container_add (GTK_CONTAINER (vbox), entry);
@@ -252,7 +252,7 @@ main (int argc, char *argv[])
       vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
       gtk_container_add (GTK_CONTAINER (vbox2), 
                          gtk_label_new ("Jonathan and Kristian's list of words.\n\nA GtkTreeModelSort wrapping the GtkTreeStore of window 1"));
-      gtk_container_add (GTK_CONTAINER (window2), vbox2);
+      gtk_window_set_child (GTK_WINDOW (window2), vbox2);
       
       scrolled_window2 = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled_window2), TRUE);
@@ -319,7 +319,7 @@ main (int argc, char *argv[])
       vbox3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
       gtk_container_add (GTK_CONTAINER (vbox3), 
                          gtk_label_new ("Jonathan and Kristian's list of words.\n\nA GtkTreeModelSort wrapping the GtkTreeModelSort of window 2"));
-      gtk_container_add (GTK_CONTAINER (window3), vbox3);
+      gtk_window_set_child (GTK_WINDOW (window3), vbox3);
       
       scrolled_window3 = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled_window3), TRUE);

diff --git a/tests/testtreeview.c b/tests/testtreeview.c
index 534a6f0f6e679116512d9294ae1e0c1e5f14fc14..a5648c6be98378d81f6c02d4801b35578bc3ccb4 100644 (file)
--- a/tests/testtreeview.c
+++ b/tests/testtreeview.c
@@ -702,7 +702,7 @@ main (int    argc,
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
 
   tv = gtk_tree_view_new_with_model (models[0]);
   g_signal_connect (tv, "row-activated", G_CALLBACK (on_row_activated), NULL);

diff --git a/tests/testverticalcells.c b/tests/testverticalcells.c
index aaead5a21ba2dbd525772b3ffdb7487d466b849d..b3aaed39243b148cc99908c2666dab198c12aaa4 100644 (file)
--- a/tests/testverticalcells.c
+++ b/tests/testverticalcells.c
@@ -324,7 +324,7 @@ main (gint argc, gchar **argv)
   gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled_window), TRUE);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), 
                                  GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-  gtk_container_add (GTK_CONTAINER (window), scrolled_window);
+  gtk_window_set_child (GTK_WINDOW (window), scrolled_window);
 
   tree_model = create_model ();
   tree_view = gtk_tree_view_new_with_model (tree_model);

diff --git a/tests/testvolumebutton.c b/tests/testvolumebutton.c
index 252ab96ecfb4ec3ac51b073d60474f749237729c..5a3b31f04909c4422745834b1a61057c1f654dc8 100644 (file)
--- a/tests/testvolumebutton.c
+++ b/tests/testvolumebutton.c
@@ -95,7 +95,7 @@ main (int    argc,
                     G_CALLBACK (value_changed),
                     NULL);
 
-  gtk_container_add (GTK_CONTAINER (window), vbox);
+  gtk_window_set_child (GTK_WINDOW (window), vbox);
   gtk_container_add (GTK_CONTAINER (vbox), box);
   gtk_container_add (GTK_CONTAINER (box), button);
   gtk_container_add (GTK_CONTAINER (box), button2);

diff --git a/tests/testwidgetfocus.c b/tests/testwidgetfocus.c
index 58e72cf2201398489f3ff95b9ea566a0ed2b54dc..9a9ea5302ab0d1aa32764bba03eed04620d918a1 100644 (file)
--- a/tests/testwidgetfocus.c
+++ b/tests/testwidgetfocus.c
@@ -297,7 +297,7 @@ main(int argc, char **argv)
 
   gtk_window_set_decorated (GTK_WINDOW (window), FALSE);
 
-  gtk_container_add (GTK_CONTAINER (window), widget);
+  gtk_window_set_child (GTK_WINDOW (window), widget);
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
 
   gtk_widget_show (window);

diff --git a/tests/testwidgettransforms.c b/tests/testwidgettransforms.c
index f48c9489a0e4e9d0b42cafb3aaad9801c332cf16..3dc684d74c55e94085941dcb4de28879c20f973f 100644 (file)
--- a/tests/testwidgettransforms.c
+++ b/tests/testwidgettransforms.c
@@ -341,7 +341,7 @@ main (int argc, char **argv)
   gtk_widget_set_vexpand (transform_tester, TRUE);
   gtk_container_add (GTK_CONTAINER (box), transform_tester);
   gtk_container_add (GTK_CONTAINER (box), matrix_chooser);
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
 
   gtk_window_set_default_size ((GtkWindow *)window, 200, 200);
   g_signal_connect (window, "close-request", G_CALLBACK (quit_cb), &done);

diff --git a/tests/testwindowdrag.c b/tests/testwindowdrag.c
index 07c7735f590f69df75debc42aa6566d2ceb7cfd5..2f8d1539ac5eb873d6b1533e57173796b0835e6c 100644 (file)
--- a/tests/testwindowdrag.c
+++ b/tests/testwindowdrag.c
@@ -108,7 +108,7 @@ main (int argc, char *argv[])
   gtk_window_set_titlebar (GTK_WINDOW (window), gtk_header_bar_new ());
 
   grid = gtk_grid_new ();
-  gtk_container_add (GTK_CONTAINER (window), grid);
+  gtk_window_set_child (GTK_WINDOW (window), grid);
 
   gtk_grid_attach (GTK_GRID (grid),
                    resize_button (GDK_SURFACE_EDGE_NORTH_WEST), 

diff --git a/tests/testwindowsize.c b/tests/testwindowsize.c
index 620a5c3b470923e3299b4efac2e804ddd1f8fe81..99148869bf75ca536903af42e0dfa480afc0b932 100644 (file)
--- a/tests/testwindowsize.c
+++ b/tests/testwindowsize.c
@@ -87,7 +87,7 @@ create_window (void)
   grid = gtk_grid_new ();
   gtk_grid_set_row_spacing (GTK_GRID (grid), 12);
   gtk_grid_set_column_spacing (GTK_GRID (grid), 12);
-  gtk_container_add (GTK_CONTAINER (window), grid);
+  gtk_window_set_child (GTK_WINDOW (window), grid);
 
   label = gtk_label_new ("Width chars");
   gtk_widget_set_halign (label, GTK_ALIGN_START);

diff --git a/tests/treestoretest.c b/tests/treestoretest.c
index d8a3430b86ea9a44bc0fc9ce197dc74338007898..bd61bbdbfe0b680eb03a01e042dbe958bdba7259 100644 (file)
--- a/tests/treestoretest.c
+++ b/tests/treestoretest.c
@@ -345,7 +345,7 @@ make_window (gint view_type)
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window), tree_view);
   gtk_widget_set_vexpand (scrolled_window, TRUE);
   gtk_container_add (GTK_CONTAINER (vbox), scrolled_window);
-  gtk_container_add (GTK_CONTAINER (window), vbox);
+  gtk_window_set_child (GTK_WINDOW (window), vbox);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
                                  GTK_POLICY_AUTOMATIC,
                                  GTK_POLICY_AUTOMATIC);

diff --git a/tests/video-timer.c b/tests/video-timer.c
index 2d9e12fb424be03edbe2bbd12d08cd3160d00b26..512ab7a66f229325aadeef616c7849b082fb342a 100644 (file)
--- a/tests/video-timer.c
+++ b/tests/video-timer.c
@@ -402,7 +402,7 @@ main(int argc, char **argv)
 
   da = gtk_drawing_area_new ();
   gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), on_draw, NULL, NULL);
-  gtk_container_add (GTK_CONTAINER (window), da);
+  gtk_window_set_child (GTK_WINDOW (window), da);
 
   gtk_widget_show (window);
 

diff --git a/testsuite/gtk/action.c b/testsuite/gtk/action.c
index f1e38550e229228efe4aaf72f5d4f1d38d59e527..a07526cbf67dc45aeb812333a479f606adb4ef36 100644 (file)
--- a/testsuite/gtk/action.c
+++ b/testsuite/gtk/action.c
@@ -58,7 +58,7 @@ test_action (void)
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   button = gtk_button_new ();
 
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
   gtk_container_add (GTK_CONTAINER (box), button);
 
   win_actions = g_simple_action_group_new ();
@@ -210,7 +210,7 @@ test_overlap (void)
   window = gtk_window_new ();
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
 
   win_actions = g_simple_action_group_new ();
   g_action_map_add_action_entries (G_ACTION_MAP (win_actions),

diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c
index 345178bc5fb58b907c2aeb4c72e938ff5b9b0e4c..14d5a4adc8b9785761bab95c39648dbd5e001603 100644 (file)
--- a/testsuite/gtk/builder.c
+++ b/testsuite/gtk/builder.c
@@ -904,7 +904,6 @@ test_children (void)
 {
   GtkBuilder * builder;
   GtkWidget *content_area;
-  GList *children;
   const gchar buffer1[] =
     "<interface>"
     "  <object class=\"GtkWindow\" id=\"window1\">"
@@ -934,7 +933,9 @@ test_children (void)
 
   GObject *window, *button;
   GObject *dialog, *vbox, *action_area;
-  
+  GtkWidget *child;
+  int count;
+
   builder = builder_new_from_string (buffer1, -1, NULL);
   window = gtk_builder_get_object (builder, "window1");
   g_assert (window != NULL);
@@ -948,15 +949,18 @@ test_children (void)
 
   gtk_widget_destroy (GTK_WIDGET (window));
   g_object_unref (builder);
-  
+
   builder = builder_new_from_string (buffer2, -1, NULL);
   dialog = gtk_builder_get_object (builder, "dialog1");
   g_assert (dialog != NULL);
   g_assert (GTK_IS_DIALOG (dialog));
-  children = gtk_container_get_children (GTK_CONTAINER (dialog));
-  g_assert_cmpint (g_list_length (children), ==, 2);
-  g_list_free (children);
-  
+  count = 0;
+  for (child = gtk_widget_get_first_child (GTK_WIDGET (dialog));
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    count++;
+  g_assert_cmpint (count, ==, 2);
+
   vbox = gtk_builder_get_object (builder, "dialog1-vbox");
   content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
   g_assert (vbox != NULL);

diff --git a/testsuite/gtk/displayclose.c b/testsuite/gtk/displayclose.c
index e5e33c880c8573effe7523c4c83df655cd03af4f..e6093dcf9eb0c0ac67f26a1807c7ae27d4166823 100644 (file)
--- a/testsuite/gtk/displayclose.c
+++ b/testsuite/gtk/displayclose.c
@@ -28,7 +28,7 @@ main (int argc, char **argv)
   but = gtk_button_new_with_label ("Try to Exit");
   g_signal_connect_swapped (but, "clicked",
                            G_CALLBACK (gtk_widget_destroy), win);
-  gtk_container_add (GTK_CONTAINER (win), but);
+  gtk_window_set_child (GTK_WINDOW (win), but);
 
   gtk_widget_show (win);
 

diff --git a/testsuite/gtk/filtermodel.c b/testsuite/gtk/filtermodel.c
index 40d67e0d8ba5a59b37a8d0b9c84f1fdc7a4cf466..99a3e8ed323c502b1b64a8763f4c82118e8ed491 100644 (file)
--- a/testsuite/gtk/filtermodel.c
+++ b/testsuite/gtk/filtermodel.c
@@ -4690,7 +4690,7 @@ specific_append_after_collapse (void)
 
   window = gtk_window_new ();
   tree_view = gtk_tree_view_new_with_model (sort);
-  gtk_container_add (GTK_CONTAINER (window), tree_view);
+  gtk_window_set_child (GTK_WINDOW (window), tree_view);
   gtk_widget_realize (tree_view);
 
   while (g_main_context_pending (NULL))
@@ -4810,7 +4810,7 @@ specific_sort_filter_remove_node (void)
 
   window = gtk_window_new ();
   tree_view = gtk_tree_view_new_with_model (filter);
-  gtk_container_add (GTK_CONTAINER (window), tree_view);
+  gtk_window_set_child (GTK_WINDOW (window), tree_view);
   gtk_widget_realize (tree_view);
 
   while (g_main_context_pending (NULL))

diff --git a/testsuite/gtk/grid-layout.c b/testsuite/gtk/grid-layout.c
index 9ef07e1ea0be64cff0b370ecfc0909b9b8f8af51..2b97c7c9b7620e4c99d189f6cb2f12cc8cd4fa1c 100644 (file)
--- a/testsuite/gtk/grid-layout.c
+++ b/testsuite/gtk/grid-layout.c
@@ -114,7 +114,7 @@ test_simple_row (void)
 
   window = gtk_window_new ();
   parent = g_object_new (GTK_TYPE_GIZMO, NULL);
-  gtk_container_add (GTK_CONTAINER (window), parent);
+  gtk_window_set_child (GTK_WINDOW (window), parent);
 
   layout = gtk_grid_layout_new ();
   gtk_widget_set_layout_manager (parent, layout);
@@ -207,7 +207,7 @@ test_simple_column (void)
 
   window = gtk_window_new ();
   parent = g_object_new (GTK_TYPE_GIZMO, NULL);
-  gtk_container_add (GTK_CONTAINER (window), parent);
+  gtk_window_set_child (GTK_WINDOW (window), parent);
 
   layout = gtk_grid_layout_new ();
   gtk_widget_set_layout_manager (parent, layout);
@@ -311,7 +311,7 @@ test_spans (void)
 
   window = gtk_window_new ();
   parent = g_object_new (GTK_TYPE_GIZMO, NULL);
-  gtk_container_add (GTK_CONTAINER (window), parent);
+  gtk_window_set_child (GTK_WINDOW (window), parent);
 
   layout = gtk_grid_layout_new ();
   gtk_widget_set_layout_manager (parent, layout);
@@ -427,7 +427,7 @@ test_homogeneous (void)
 
   window = gtk_window_new ();
   parent = g_object_new (GTK_TYPE_GIZMO, NULL);
-  gtk_container_add (GTK_CONTAINER (window), parent);
+  gtk_window_set_child (GTK_WINDOW (window), parent);
 
   layout = gtk_grid_layout_new ();
   gtk_grid_layout_set_row_homogeneous (GTK_GRID_LAYOUT (layout), TRUE);
@@ -552,7 +552,7 @@ test_simple_layout (void)
 
   window = gtk_window_new ();
   parent = g_object_new (GTK_TYPE_GIZMO, NULL);
-  gtk_container_add (GTK_CONTAINER (window), parent);
+  gtk_window_set_child (GTK_WINDOW (window), parent);
 
   layout = gtk_grid_layout_new ();
   gtk_grid_layout_set_row_homogeneous (GTK_GRID_LAYOUT (layout), TRUE);

diff --git a/testsuite/gtk/popover.c b/testsuite/gtk/popover.c
index 2a982e2417199ddb74614e1f4d385c5cb9d6cfc0..db8112a0852f0398504368831b6934e3656c6ba2 100644 (file)
--- a/testsuite/gtk/popover.c
+++ b/testsuite/gtk/popover.c
@@ -46,7 +46,7 @@ test_show_popover (void)
   popover = gtk_popover_new ();
   gtk_popover_set_child (GTK_POPOVER (popover), gtk_label_new ("Nu?"));
   gtk_menu_button_set_popover (GTK_MENU_BUTTON (button), popover);
-  gtk_container_add (GTK_CONTAINER (window), button);
+  gtk_window_set_child (GTK_WINDOW (window), button);
 
   gtk_window_present (GTK_WINDOW (window));
 

diff --git a/testsuite/gtk/propertylookuplistmodel.c b/testsuite/gtk/propertylookuplistmodel.c
index 4e8092e06f1ee6e15a33413b7b64cd874425823a..13c129feff52159734fc1ee388e47158efbc0663 100644 (file)
--- a/testsuite/gtk/propertylookuplistmodel.c
+++ b/testsuite/gtk/propertylookuplistmodel.c
@@ -112,7 +112,7 @@ create_widget_tree (void)
   widgets = g_slist_prepend (widgets, window);
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
 
   grid = gtk_grid_new ();
   gtk_container_add (GTK_CONTAINER (box), grid);

diff --git a/testsuite/gtk/regression-tests.c b/testsuite/gtk/regression-tests.c
index 6b64e863dafd7b304793edac4213ce580f39d5eb..6ab853ffcb9fbff5657f2c7067e9337cd584f215 100644 (file)
--- a/testsuite/gtk/regression-tests.c
+++ b/testsuite/gtk/regression-tests.c
@@ -26,7 +26,7 @@ test_9d6da33ff5c5e41e3521e1afd63d2d67bc915753 (void)
 
   window = gtk_window_new ();
   label = gtk_label_new ("I am sensitive.");
-  gtk_container_add (GTK_CONTAINER (window), label);
+  gtk_window_set_child (GTK_WINDOW (window), label);
 
   gtk_widget_set_sensitive (label, FALSE);
   gtk_widget_set_sensitive (window, FALSE);
@@ -45,7 +45,7 @@ test_94f00eb04dd1433cf1cc9a3341f485124e38abd1 (void)
 
   window = gtk_window_new ();
   label = gtk_label_new ("I am insensitive.");
-  gtk_container_add (GTK_CONTAINER (window), label);
+  gtk_window_set_child (GTK_WINDOW (window), label);
 
   gtk_widget_set_sensitive (window, FALSE);
   gtk_widget_set_sensitive (label, FALSE);

diff --git a/testsuite/gtk/treeview.c b/testsuite/gtk/treeview.c
index f92f42c7b8fe181cf500a6e81ddf6f2c84590115..e97258d93ae5c6b747e4dc187eba49632285b9a8 100644 (file)
--- a/testsuite/gtk/treeview.c
+++ b/testsuite/gtk/treeview.c
@@ -208,7 +208,7 @@ test_row_separator_height (void)
                                                "text", 0,
                                                NULL);
 
-  gtk_container_add (GTK_CONTAINER (window), tree_view);
+  gtk_window_set_child (GTK_WINDOW (window), tree_view);
   gtk_widget_show (window);
 
   gtk_test_widget_wait_for_draw (window);

diff --git a/testsuite/gtk/window.c b/testsuite/gtk/window.c
index d0d3dc27b4eef53146ec442c2dcb2561145cf826..847d458f80238f2b1011626accbd6b388ab82026 100644 (file)
--- a/testsuite/gtk/window.c
+++ b/testsuite/gtk/window.c
@@ -77,7 +77,7 @@ test_default_size (void)
 
   da = gtk_drawing_area_new ();
   gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), on_draw, NULL, NULL);
-  gtk_container_add (GTK_CONTAINER (window), da);
+  gtk_window_set_child (GTK_WINDOW (window), da);
 
   /* check that default size is unset initially */
   gtk_window_get_default_size (GTK_WINDOW (window), &w, &h);
@@ -165,7 +165,7 @@ test_resize (void)
 
   da = gtk_drawing_area_new ();
   gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), on_draw, NULL, NULL);
-  gtk_container_add (GTK_CONTAINER (window), da);
+  gtk_window_set_child (GTK_WINDOW (window), da);
 
   /* test that resize before show overrides default size */
   gtk_window_set_default_size (GTK_WINDOW (window), 500, 500);

diff --git a/testsuite/reftests/set-default-direction.c b/testsuite/reftests/set-default-direction.c
index 468d3dc92208ba712897077bbaeaacc201dd69d4..0784edc0bd473d763a86ba571a88049395676bf4 100644 (file)
--- a/testsuite/reftests/set-default-direction.c
+++ b/testsuite/reftests/set-default-direction.c
@@ -80,9 +80,6 @@ swap_child (GtkWidget *window)
 {
   GtkWidget *image;
 
-  gtk_container_remove (GTK_CONTAINER (window), gtk_bin_get_child (GTK_BIN (window)));
-
   image = gtk_image_new_from_icon_name ("go-next");
-  gtk_widget_show (image);
-  gtk_container_add (GTK_CONTAINER (window), image);
+  gtk_window_set_child (GTK_WINDOW (window), image);
 }